Refresh patch manpage-debian.patch (offset), drop remaining patches (all
authorgregor herrmann <gregoa@debian.org>
Sat, 3 Dec 2011 00:02:47 +0000 (00:02 -0000)
committergregor herrmann <gregoa@debian.org>
Sat, 3 Dec 2011 00:02:47 +0000 (00:02 -0000)
included upstream).

bti.xml
debian/changelog
debian/patches/0001-Output-actually-used-config-file-name-instead-of-har.patch [deleted file]
debian/patches/identi.ca-oauth.patch [deleted file]
debian/patches/manpage-debian.patch
debian/patches/series
debian/patches/statusnet.patch [deleted file]

diff --git a/bti.xml b/bti.xml
index 58d05ae..7bc1e85 100644 (file)
--- a/bti.xml
+++ b/bti.xml
            </varlistentry>
         </variablelist>
          <para>
-           There is an example config file called
-           <filename>bti.example</filename> in the source tree that shows
-           the structure of the file if you need an example to work off of.
+           There is an example config file in
+           <filename>/usr/share/doc/bti/examples/bti.example</filename> that shows
+           the structure of the file.
          </para>
          <para>
            Configuration options have the following priority:
index 3956b84..fdc7aeb 100644 (file)
@@ -3,6 +3,8 @@ bti (032-1) UNRELEASED; urgency=low
   * debian/watch: use github redirector, there are no released tarballs at the
     moment.
   * New upstream release
+  * Refresh patch manpage-debian.patch (offset), drop remaining patches (all
+    included upstream).
 
  -- gregor herrmann <gregoa@debian.org>  Sat, 03 Dec 2011 00:54:11 +0100
 
diff --git a/debian/patches/0001-Output-actually-used-config-file-name-instead-of-har.patch b/debian/patches/0001-Output-actually-used-config-file-name-instead-of-har.patch
deleted file mode 100644 (file)
index dcc7a74..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-From faf1ebab9ce65a8ec7b8bb83f0e969396417cfd5 Mon Sep 17 00:00:00 2001
-From: gregor herrmann <gregoa@debian.org>
-Date: Fri, 4 Nov 2011 20:42:19 +0100
-Subject: [PATCH] Output actually used config file name instead of hardcoded
- ~/.bti in request_access_token().
-
-This was reported by Vincent Lefevre in http://bugs.debian.org/646681
----
- bti.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bti.c b/bti.c
-index 8478345..11cd0ab 100644
---- a/bti.c
-+++ b/bti.c
-@@ -519,10 +519,10 @@ static int request_access_token(struct session *session)
-       fprintf(stdout,
-               "Please put these two lines in your bti "
--              "configuration file (~/.bti):\n"
-+              "configuration file (%s):\n"
-               "access_token_key=%s\n"
-               "access_token_secret=%s\n",
--              at_key, at_secret);
-+              session->configfile, at_key, at_secret);
-       return 0;
- }
--- 
-1.7.7.1
-
diff --git a/debian/patches/identi.ca-oauth.patch b/debian/patches/identi.ca-oauth.patch
deleted file mode 100644 (file)
index 876d821..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: s/http/https/ in identi.ca OAuth URIs
-Origin: https://github.com/amir/bti/commit/7ac5a2449ed44f84193a6cf42bfea3282608a77c
-Bug-Debian: http://bugs.debian.org/602507
-Author: Amir Mohammad Saied <amirsaied@gmail.com>
-Reviewed-by: gregor herrmann <gregoa@debian.org>
-Last-Update: 2011-10-25
-
---- a/bti.c
-+++ b/bti.c
-@@ -255,9 +255,9 @@
- static const char twitter_request_token_uri[]  = "http://twitter.com/oauth/request_token";
- static const char twitter_access_token_uri[]   = "http://twitter.com/oauth/access_token";
- static const char twitter_authorize_uri[]      = "http://twitter.com/oauth/authorize?oauth_token=";
--static const char identica_request_token_uri[] = "http://identi.ca/api/oauth/request_token?oauth_callback=oob";
--static const char identica_access_token_uri[]  = "http://identi.ca/api/oauth/access_token";
--static const char identica_authorize_uri[]     = "http://identi.ca/api/oauth/authorize?oauth_token=";
-+static const char identica_request_token_uri[] = "https://identi.ca/api/oauth/request_token?oauth_callback=oob";
-+static const char identica_access_token_uri[]  = "https://identi.ca/api/oauth/access_token";
-+static const char identica_authorize_uri[]     = "https://identi.ca/api/oauth/authorize?oauth_token=";
- static const char user_uri[]     = "/user_timeline/";
- static const char update_uri[]   = "/update.xml";
index 06a46db..6e3238b 100644 (file)
@@ -3,11 +3,11 @@ Description: change the pointer to the example config file on Debian systems
 Origin: vendor
 Forwarded: not-needed
 Author: gregor herrmann <gregoa@debian.org>
-Last-Update: 2010-05-19
+Last-Update: 2011-12-03
 
 --- a/bti.xml
 +++ b/bti.xml
-@@ -404,9 +404,9 @@
+@@ -405,9 +405,9 @@
             </varlistentry>
          </variablelist>
           <para>
index e115c2f..c6aa687 100644 (file)
@@ -1,4 +1 @@
 manpage-debian.patch
-statusnet.patch
-identi.ca-oauth.patch
-0001-Output-actually-used-config-file-name-instead-of-har.patch
diff --git a/debian/patches/statusnet.patch b/debian/patches/statusnet.patch
deleted file mode 100644 (file)
index 84ede2e..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: laconi.ca was renamed to StatusNet
-Origin: vendor
-Bug-Debian: http://bugs.debian.net/605407
-Forwarded: yes
-Author: gregor herrmann <gregoa@debian.org>
-Last-Update: 2010-11-29
-
---- a/bti.xml
-+++ b/bti.xml
-@@ -99,7 +99,7 @@
-               options are "twitter" to send to twitter.com and "identica" to
-         send to identi.ca.
--        If you want to send the message to a custom laconi.ca installation,
-+        If you want to send the message to a custom StatusNet installation,
-         you should specify the API URI. For example identi.ca's URI is:
-         https://identi.ca/api/statuses
-               </para>
-@@ -345,7 +345,7 @@
-                options are either "twitter" or "identica" to send to
-                twitter.com or identi.ca respectively.
--         If you want to send the message to a custom laconi.ca installation,
-+         If you want to send the message to a custom StatusNet installation,
-          you should specify the API URI. For example identi.ca's URI is:
-          https://identi.ca/api/statuses.
-                </para>
---- a/bti.example
-+++ b/bti.example
-@@ -6,7 +6,7 @@
- account=twitmaster
- password=icanhascheezburger
- host=identica
--# Example of a custom laconica installation
-+# Example of a custom StatusNet installation
- #host=http://army.twit.tv/api/statuses
- logfile=.bti.log
- #action=update