Merge tag 'upstream/033'
authorgregor herrmann <gregoa@debian.org>
Thu, 27 Jun 2013 22:37:17 +0000 (00:37 +0200)
committergregor herrmann <gregoa@debian.org>
Thu, 27 Jun 2013 22:37:17 +0000 (00:37 +0200)
Upstream version 033

Conflicts:
bti.1

15 files changed:
bti-shrink-urls.1 [deleted file]
bti.xml
debian/README.Debian [new file with mode: 0644]
debian/bti.bash-completion [new file with mode: 0644]
debian/bti.examples [new file with mode: 0644]
debian/changelog [new file with mode: 0644]
debian/clean [new file with mode: 0644]
debian/compat [new file with mode: 0644]
debian/control [new file with mode: 0644]
debian/copyright [new file with mode: 0644]
debian/patches/manpage-debian.patch [new file with mode: 0644]
debian/patches/series [new file with mode: 0644]
debian/rules [new file with mode: 0755]
debian/source/format [new file with mode: 0644]
debian/watch [new file with mode: 0644]

diff --git a/bti-shrink-urls.1 b/bti-shrink-urls.1
deleted file mode 100644 (file)
index 0c5ca7f..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-'\" t
-.\"     Title: bti-shrink-urls
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: March 2009
-.\"    Manual: bti-shrink-urls
-.\"    Source: bti-shrink-urls
-.\"  Language: English
-.\"
-.TH "BTI\-SHRINK\-URLS" "1" "March 2009" "bti-shrink-urls" "bti-shrink-urls"
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-bti-shrink-urls \- convert URLs to a shorter form using a web service
-.SH "SYNOPSIS"
-.HP \w'\fBbti\fR\ 'u
-\fBbti\fR [\fB\-\-escaped\fR] [\fB\-\-help\fR] [\fBURL\fR]
-.SH "DESCRIPTION"
-.PP
-bti\-shrink\-urls converts URLs to a shorter form using a web service\&.
-.PP
-Currently http://2tu\&.us/ (default) and http://bit\&.ly / http://j\&.mp are supported\&.
-.SH "OPTIONS"
-.PP
-\fB\-\-escaped\fR
-.RS 4
-Don\'t escape special characters in the URL any more, they are already percent encoded\&.
-.RE
-.PP
-\fB\-\-help\fR
-.RS 4
-Print help text\&.
-.RE
-.PP
-\fBURL\fR
-.RS 4
-Specify the URL to be converted\&. If no URL is given bti\-shrink\-urls waits for input on stdin\&.
-.RE
-.SH "CONFIGURATION"
-.PP
-bti\-shrink\-urls is configured by setting some values in ~/\&.bti:
-.PP
-\fBshrink_host\fR
-.RS 4
-Possible values: 2tu\&.us (default), bit\&.ly, j\&.mp
-.RE
-.PP
-\fBshrink_bitly_login\fR
-.RS 4
-API login for bit\&.ly, j\&.mp, required if shrink_host is set to bit\&.ly or j\&.mp\&. See https://code\&.google\&.com/p/bitly\-api/wiki/ApiDocumentation
-.RE
-.PP
-\fBshrink_bitly_key\fR
-.RS 4
-API key for bit\&.ly, j\&.mp, required if shrink_host is set to bit\&.ly or j\&.mp\&. See https://code\&.google\&.com/p/bitly\-api/wiki/ApiDocumentation
-.RE
-.SH "AUTHOR"
-.PP
-Written by Bart Trojanowski
-bart@jukie\&.net\&.
-.SH "COPYRIGHT AND LICENSE"
-.PP
-Copyright (C) 2009 Bart Trojanowski
-bart@jukie\&.net\&.
-.PP
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License\&.
diff --git a/bti.xml b/bti.xml
index a2efd60eb52bb17699ef6e14b2a6f22e8d3f8840..05b8181a3950a2cf082ce6634400d9a65a7d5fa0 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:
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644 (file)
index 0000000..c179896
--- /dev/null
@@ -0,0 +1,17 @@
+Some notes on OAuth
+===================
+
+1) Twitter
+----------
+
+For Twitter see the instructions provided by Amir Mohammad Saied:
+http://gluegadget.com/blog/index.php?/archives/34-Twitter,-OAuth-and-bti.html
+
+More information by Alberto Panizzo at
+https://albertoembedded.wordpress.com/2010/09/04/tweet-from-the-linux-shell-on-ubuntu-karmic/
+
+2) Identi.ca
+------------
+
+For Identi.ca the procedure is basically the same, the URL for registering a
+new application is https://identi.ca/settings/oauthapps/new
diff --git a/debian/bti.bash-completion b/debian/bti.bash-completion
new file mode 100644 (file)
index 0000000..077b0d6
--- /dev/null
@@ -0,0 +1 @@
+bti-bashcompletion bti
diff --git a/debian/bti.examples b/debian/bti.examples
new file mode 100644 (file)
index 0000000..38aa916
--- /dev/null
@@ -0,0 +1 @@
+bti.example
diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..54df9a1
--- /dev/null
@@ -0,0 +1,291 @@
+bti (032-2) unstable; urgency=low
+
+  * Update Vcs-* headers.
+  * debian/watch: update after github URL schema change.
+  * Build depend on libcurl4-gnutls-dev instead of libcurl4-nss-dev (cf.
+    #650138) and make build dependency on liboauth-dev versioned just in
+    case). (LP: #1072720)
+  * Remove version from bash-completion build dependency, nothing older in
+    the archive.
+  * debian/copyright: switch formatting to Copyright-Format 1.0.
+  * Update years of packaging copyright.
+  * Set Standards-Version to 3.9.4 (no changes).
+  * Bump debhelper compatibility level to 9.
+  * debian/rules: make build non-silent.
+
+ -- gregor herrmann <gregoa@debian.org>  Mon, 06 May 2013 21:27:22 +0200
+
+bti (032-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/watch: use github redirector, there are no released tarballs at the
+    moment.
+  * The tarball from github doesn't ship a configure script; use
+    dh-autoreconf.
+  * Refresh patch manpage-debian.patch (offset), drop remaining patches (all
+    included upstream).
+
+ -- gregor herrmann <gregoa@debian.org>  Sat, 03 Dec 2011 01:25:55 +0100
+
+bti (031-4) unstable; urgency=low
+
+  * Build-depend on libcurl4-nss-dev instead of libcurl4-gnutls-dev; they
+    conflict with each other, and liboauth-dev now requires the former.
+    (Fixes a not-yet-detected FTBFS.)
+
+ -- gregor herrmann <gregoa@debian.org>  Sat, 26 Nov 2011 23:53:14 +0100
+
+bti (031-3) unstable; urgency=low
+
+  * Add patch to output the correct configfile name (identi.ca/OAuth/access
+    tokens). Thanks to Vincent Lefevre for the bug report; closes: #646681.
+
+ -- gregor herrmann <gregoa@debian.org>  Sat, 05 Nov 2011 17:48:05 +0100
+
+bti (031-2) unstable; urgency=low
+
+  * New patch debian/patches/identi.ca-oauth.patch: change identica_* OAuth
+    URI's to point to https instead of http (closes: #602507).
+  * Set Standards-Version to 3.9.2 (no changes).
+  * Improve long description.
+
+ -- gregor herrmann <gregoa@debian.org>  Tue, 25 Oct 2011 20:35:48 +0200
+
+bti (031-1) unstable; urgency=low
+
+  * New upstream release:
+    - addresses "bti doesn't warn if the password is incorrect": check server
+      replies in non-background mode, only in non-OAuth mode
+      (partly solves #602502)
+
+ -- gregor herrmann <gregoa@debian.org>  Tue, 22 Mar 2011 17:18:10 +0100
+
+bti (030-1) unstable; urgency=low
+
+  * New upstream release.
+  * Switch to debhelper 8.
+
+ -- gregor herrmann <gregoa@debian.org>  Fri, 18 Mar 2011 12:32:44 +0100
+
+bti (029-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- gregor herrmann <gregoa@debian.org>  Mon, 07 Feb 2011 18:32:28 +0100
+
+bti (029-1) experimental; urgency=low
+
+  * New upstream release: includes fixes for
+    + "the --dry-run option has no effect (tweets get posted anyway)
+       with OAuth" (closes: #608608)
+    + "--replyto doesn't work with OAuth" (closes: #608112)
+  * laconi.ca was renamed to StatusNet (in August 2009); adjust package
+    description and add a patch to change the name in the manpage and the
+    example config; thanks to Julien Valroff for the bug report
+    (closes: #605407).
+  * Drop patch 0001-Fixing-Identi.ca-s-OAuth-request_token-URI.patch, applied
+    upstream.
+  * Refresh remaining patches.
+  * debian/copyright: update years of upstream and packaging copyright; update
+    formatting.
+  * Don't install README anymore.
+  * Upload to experimental because of the freeze.
+
+ -- gregor herrmann <gregoa@debian.org>  Fri, 14 Jan 2011 02:43:10 +0100
+
+bti (028-2) unstable; urgency=low
+
+  * Add patch 0001-Fixing-Identi.ca-s-OAuth-request_token-URI.patch by Amir
+    Mohammad Saied which adds the oauth_callback parameter to the identi.ca
+    request_token URI in order to make OAuth work with identi.ca
+    (closes: #602507).
+  * Minor fixes in README.Debian.
+
+ -- gregor herrmann <gregoa@debian.org>  Wed, 24 Nov 2010 18:03:23 +0100
+
+bti (028-1) unstable; urgency=low
+
+  * New upstream release:
+    - support for replying to notices
+    - adds OAuth support for both twitter and identi.ca (closes: #588235)
+    - split --background from --bash, and make the latter imply the former
+  * Refresh manpage-debian.patch.
+  * Set Standards-Version to 3.9.1 (no changes).
+  * Add build dependency on liboauth-dev.
+  * debian/rules: switch order of dh arguments (preparation for dh8).
+  * debian/copyright: update years of upstream copyright.
+  * Add README.Debian about OAuth usage.
+
+ -- gregor herrmann <gregoa@debian.org>  Wed, 03 Nov 2010 23:00:59 +0100
+
+bti (026-1) unstable; urgency=low
+
+  * Bump build dependency on bash-completion (needed for --with
+    bash-completion in debian/rules).
+
+  * New upstream release.
+  * Refresh patch manpage-debian.patch and DEP3 patch headers.
+  * debian/copyright: refresh DEP5 header, update years of packaging
+    copyright.
+  * Set Standards-Version to 3.8.4 (no changes).
+  * Convert to source format 3.0 (quilt). Remove quilt framework.
+    Lower debhelper dependency.
+
+ -- gregor herrmann <gregoa@debian.org>  Wed, 19 May 2010 21:41:04 +0200
+
+bti (025-1) unstable; urgency=low
+
+  * New upstream release: 
+    - set default host to twitter (closes: #563098)
+    - mention correct host in prompts (closes: #563099)
+
+ -- gregor herrmann <gregoa@debian.org>  Sun, 10 Jan 2010 01:29:11 +0100
+
+bti (024-1) unstable; urgency=low
+
+  * New upstream release:
+    - do not display password while user types it (LP: #386525)
+    - disable echo when reading the password
+    - add laconica group support
+  * debian/control: add Homepage field and adjust long description.
+  * Use "--with bash-completion" in debian/rules to install bash-completion
+    snippet; bump build dependencies on debhelper and bash-completion in
+    debian/control.
+
+ -- gregor herrmann <gregoa@debian.org>  Wed, 02 Dec 2009 17:09:28 +0100
+
+bti (023-2) unstable; urgency=low
+
+  * Build depend on libreadline-dev instead of libreadline5-dev, thanks to
+    Matthias Klose for the pointer.
+  * Set Standards-Version to 3.8.3 (no changes).
+  * Add debian/README.source to document quilt usage.
+  * Simplify debian/rules, adjust versioned build dependencies on debhelper
+    and quilt in debian/control.
+  * Use dh_bash-completion for installing the completion snippet; adjust
+    debian/rules, add a versioned build dependency on bash-completion.
+
+ -- gregor herrmann <gregoa@debian.org>  Sun, 13 Sep 2009 16:14:08 +0200
+
+bti (023-1) unstable; urgency=low
+
+  * New upstream release, main changes:
+    - new 'verbose' mode
+    - SSL also for twitter
+  * debian/copyright: add new additional copyright holder.
+  * Refresh patch manpage-debian.patch.
+  * debian/control: mention additional actions in long description.
+
+ -- gregor herrmann <gregoa@debian.org>  Thu, 28 May 2009 17:37:08 +0200
+
+bti (022-1) unstable; urgency=low
+
+  * New upstream release, main changes:
+    - support for custim laconi.ca instances
+    - use SSL for identi.ca
+  * debian/copyright: add additional copyright holder.
+
+ -- gregor herrmann <gregoa@debian.org>  Wed, 06 May 2009 23:05:42 +0200
+
+bti (021-1) unstable; urgency=low
+
+  * New upstream release, contains changes in autoconf tools:
+    - simplify debian/rules and debian/install
+    - replace xmtlo with xsltproc, docbook-xsl, docbook-xml in debian/control
+
+ -- gregor herrmann <gregoa@debian.org>  Wed, 15 Apr 2009 17:12:53 +0200
+
+bti (020-1) unstable; urgency=low
+
+  * New upstream release:
+    - remove patch getopt.patch, included upstream
+    - remove manpage for bti-shrink-urls from debian/, included upstream
+    - upstream uses autoconf, adjust debian/rules and debian/install, remove
+      debian/manpages
+
+ -- gregor herrmann <gregoa@debian.org>  Tue, 14 Apr 2009 20:40:24 +0200
+
+bti (017-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add build-dependency on libpcre3-dev.
+  * Refresh patch manpage-debian.patch.
+  * debian/install: add new bti-shrink-urls.
+  * debian/copyright: add information about bti-shrink-urls.
+  * Create a manpage for bti-shrink-urls.
+  * debian/rules: skip dh_auto_install (upstream Makefile now has an install
+    target which is not easier to use than the manual installation we've been
+    using).
+  * Add a new patch getopt.patch to make the new commandline options available
+    in bti.c.
+
+ -- gregor herrmann <gregoa@debian.org>  Tue, 24 Mar 2009 20:47:41 +0100
+
+bti (015-1) unstable; urgency=low
+
+  * New upstream release; from the RELEASE-NOTES:
+    "--action support, bti now can output data from the twitter
+    and identica servers".
+  * Add build dependency on libxml2-dev.
+  * Refresh patch manpage-debian.patch.
+  * Set Standards-Version to 3.8.1 (no changes).
+
+ -- gregor herrmann <gregoa@debian.org>  Thu, 12 Mar 2009 17:17:11 +0100
+
+bti (014-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- gregor herrmann <gregoa@debian.org>  Sat, 14 Feb 2009 18:36:36 +0100
+
+bti (013-1) unstable; urgency=low
+
+  * New upstream release.
+  * Use dh_install instead of dh_bash-completion to install the bash
+    completion snippet in order to work around a problem on the amd64 buildd
+    (closes: #513115). Drop build dependency on bash-completion.
+
+ -- gregor herrmann <gregoa@debian.org>  Thu, 05 Feb 2009 20:54:54 +0100
+
+bti (012-1) unstable; urgency=low
+
+  * New upstream release.
+  * Install the new bash completion script; add bash-completion to
+    Build-Depends and Suggests.
+  * Refresh patch manpage-debian.patch.
+
+ -- gregor herrmann <gregoa@debian.org>  Sun, 25 Jan 2009 00:52:13 +0100
+
+bti (011-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add build dependency on libreadline5-dev.
+
+ -- gregor herrmann <gregoa@debian.org>  Tue, 20 Jan 2009 17:05:57 +0100
+
+bti (010-1) unstable; urgency=low
+
+  * New upstream release, includes a new --proxy option and honours the
+    http_proxy environment variable (closes: #511087).
+  * Refresh patch manpage-debian.patch.
+
+ -- gregor herrmann <gregoa@debian.org>  Mon, 12 Jan 2009 22:46:19 +0100
+
+bti (008-1) unstable; urgency=low
+
+  * New upstream release (due to december twitter server change).
+  * Update years of packaging copyright.
+
+ -- gregor herrmann <gregoa@debian.org>  Sat, 10 Jan 2009 06:01:45 +0100
+
+bti (007-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- gregor herrmann <gregoa@debian.org>  Sun, 26 Oct 2008 23:36:48 +0100
+
+bti (006-1) unstable; urgency=low
+
+  * Initial release (Closes: #503241)
+
+ -- gregor herrmann <gregoa@debian.org>  Fri, 24 Oct 2008 20:53:07 +0200
diff --git a/debian/clean b/debian/clean
new file mode 100644 (file)
index 0000000..232fc31
--- /dev/null
@@ -0,0 +1,2 @@
+bti.1
+bti-shrink-urls.1
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..ec63514
--- /dev/null
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..0c8feda
--- /dev/null
@@ -0,0 +1,38 @@
+Source: bti
+Maintainer: gregor herrmann <gregoa@debian.org>
+Uploaders: tony mancill <tmancill@debian.org>
+Section: net
+Priority: extra
+Build-Depends: bash-completion,
+               debhelper (>= 9),
+               dh-autoreconf,
+               docbook-xml,
+               docbook-xsl,
+               libcurl4-gnutls-dev,
+               liboauth-dev (>= 0.9.4-3.1),
+               libpcre3-dev,
+               libreadline-dev,
+               libxml2-dev,
+               xsltproc
+Standards-Version: 3.9.4
+Vcs-Browser: http://git.toastfreeware.priv.at/debian/bti.git/
+Vcs-Git: git://git.toastfreeware.priv.at/debian/bti.git
+Homepage: http://gregkh.github.com/bti/
+
+Package: bti
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Suggests: bash-completion
+Description: command line micro-blogging tool
+ bti sends a tweet message to twitter.com, identi.ca, or any other StatusNet
+ instance.
+ .
+ bti provides an easy way to send tweet messages directly from the command line
+ or a script. It reads the message on standard input and uses the account
+ and password settings either from the command line options or from a config
+ file to deliver the message.
+ .
+ Besides sending messages bti also allows one to see one's friends', a group's
+ or a specific user's timeline, the public timeline, and replies to messages.
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..8fad0ba
--- /dev/null
@@ -0,0 +1,28 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: bti
+Upstream-Contact: Greg Kroah-Hartman <greg@kroah.com>
+Source: http://www.kernel.org/pub/linux/kernel/people/gregkh/bti/
+
+Files: *
+Copyright: 2008-2011, Greg Kroah-Hartman <greg@kroah.com>
+ 2009, Bart Trojanowski <bart@jukie.net>
+ 2009-2010, Amir Mohammad Saied <amirsaied@gmail.com>
+License: GPL-2
+
+Files: bti-shrink-urls
+Copyright: 2009, Bart Trojanowski <bart@jukie.net>
+License: GPL-2
+
+Files: debian/*
+Copyright: 2008-2013, gregor herrmann <gregoa@debian.org>
+ 2008-2013, tony mancill <tmancill@debian.org>
+License: GPL-2
+
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation version 2 of the License.
+ .  
+ On Debian systems, the complete text of the GNU General Public License,
+ version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
diff --git a/debian/patches/manpage-debian.patch b/debian/patches/manpage-debian.patch
new file mode 100644 (file)
index 0000000..6e3238b
--- /dev/null
@@ -0,0 +1,22 @@
+Description: change the pointer to the example config file on Debian systems
+ (and simplify the sentence while we're at it)
+Origin: vendor
+Forwarded: not-needed
+Author: gregor herrmann <gregoa@debian.org>
+Last-Update: 2011-12-03
+
+--- a/bti.xml
++++ b/bti.xml
+@@ -405,9 +405,9 @@
+            </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:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..c6aa687
--- /dev/null
@@ -0,0 +1 @@
+manpage-debian.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..bda246b
--- /dev/null
@@ -0,0 +1,7 @@
+#!/usr/bin/make -f
+
+# make build non-silent
+export V=1
+
+%:
+       dh $@ --with bash-completion,autoreconf
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..b4af297
--- /dev/null
@@ -0,0 +1,10 @@
+version=3
+
+# old location:
+# http://www.kernel.org/pub/linux/kernel/people/gregkh/bti/bti-(.+)\.tar\.gz
+
+# the github redirector:
+# http://githubredir.debian.net/github/gregkh/bti/ .*/(\d{3})\.tar\.gz
+
+# github directly:
+https://github.com/gregkh/bti/tags .*/(\d{3})\.tar\.gz