From: Antonio Ospite Date: Thu, 24 Apr 2014 12:33:34 +0000 (+0200) Subject: Merge tag 'v0.3' into debian X-Git-Tag: debian/0.3-1~5 X-Git-Url: https://git.ao2.it/tweeper.git/commitdiff_plain/e80eeccf22777e2226ceef7a02f4b1907c8b6f10?hp=19d2c915502213e887ba7fd75c2e6b52400cd6d1 Merge tag 'v0.3' into debian Release v0.3 --- diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..b0585bd --- /dev/null +++ b/debian/changelog @@ -0,0 +1,31 @@ +tweeper (0.2-3) unstable; urgency=medium + + * debian/control: update Maintainer email address + * debian/patches: add a patch to support "audio/ogg" enclosures + * debian/control: add missing run-time dependencies. + Thanks to Anton Nesterov (Closes: #738201) + * debian/control: cosmetics remove trailing spaces + + -- Antonio Ospite Wed, 12 Feb 2014 15:37:51 +0100 + +tweeper (0.2-2) unstable; urgency=low + + * debian/gbp.conf: explicitly disable pristine-tar. + Thanks to gregor herrmann + * debian/control: bump Standards-Version to 3.9.5 + * debian/rules: use $(CURDIR) instead of $$(pwd) + * debian/control: specify the debian package branch in Vcs-Git + * debian/patches: add a fix to the man page from upstream + * debian/rules: install the NEWS file as the upstream changelog + * debian/docs: package also the README and TODO files + * debian/control: suggest libapache2-mod-php5 or php5-cgi + * debian/control: reword some list items in the long description + * debian/patches: add a patch to fix the list items in the man page + + -- Antonio Ospite Wed, 20 Nov 2013 01:19:55 +0100 + +tweeper (0.2-1) unstable; urgency=low + + * Initial release (Closes: #729858) + + -- Antonio Ospite Mon, 18 Nov 2013 14:52:14 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..8ee2f0d --- /dev/null +++ b/debian/control @@ -0,0 +1,34 @@ +Source: tweeper +Section: php +Priority: optional +Maintainer: Antonio Ospite +Build-Depends: debhelper (>= 9) +Build-Depends-Indep: asciidoc, xmlto +Standards-Version: 3.9.5 +Homepage: http://git.ao2.it/tweeper.git +Vcs-Git: git://git.ao2.it/tweeper.git -b debian +Vcs-Browser: http://git.ao2.it/tweeper.git + +Package: tweeper +Architecture: all +Depends: ${misc:Depends}, php5-cli, php5-curl, php5-xsl +Suggests: libapache2-mod-php5 | php5-cgi +Description: web scraper to convert a Twitter timeline to an RSS feed + tweeper is a web scraper which extracts the most recent public tweets of + a given user from their home page on Twitter.com and formats them in RSS, so + the information can be conveniently accessed and collected by a feed reader. + . + tweeper started as the TWitter fEEd scraPER but support for other web sites + has been added. + . + The sites that tweeper is able to scrape and convert to RSS are: + . + * Twitter.com + * Pump.io based websites, like Identi.ca + * Dilbert.com + . + tweeper can be used as: + . + 1. a command line tool; + 2. a filter for feed readers; + 3. a web based tool when PHP support is available in the web server. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..51d6bd5 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,30 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: tweeper +Upstream-Contact: Antonio Ospite +Source: http://git.ao2.it/tweeper.git + +Files: * +Copyright: 2013 Antonio Ospite +License: GPL-3.0+ + +Files: debian/* +Copyright: 2013 Antonio Ospite +License: GPL-3.0+ + +License: GPL-3.0+ + 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, either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems the full text of the GNU General Public + License version 3 can be found in the `/usr/share/common-licenses/GPL-3' + file. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..724e084 --- /dev/null +++ b/debian/docs @@ -0,0 +1,2 @@ +README +TODO diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..7ac6ffb --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,5 @@ +[DEFAULT] +debian-branch = debian +upstream-branch = master +upstream-tag = v%(version)s +pristine-tar = False diff --git a/debian/patches/0001-tweeper.1.asciidoc-mention-a-way-to-use-tweeper-from.patch b/debian/patches/0001-tweeper.1.asciidoc-mention-a-way-to-use-tweeper-from.patch new file mode 100644 index 0000000..f0a7dc2 --- /dev/null +++ b/debian/patches/0001-tweeper.1.asciidoc-mention-a-way-to-use-tweeper-from.patch @@ -0,0 +1,40 @@ +From f6c2ba4a29fe55163a0b6e3e44341bf4d007587d Mon Sep 17 00:00:00 2001 +From: Antonio Ospite +Date: Mon, 18 Nov 2013 23:16:54 +0100 +Subject: [PATCH] tweeper.1.asciidoc: mention a way to use tweeper from a web + server +X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM/Vb;]yA5\I~93>J<_`<4)A{':UrE + +--- + tweeper.1.asciidoc | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/tweeper.1.asciidoc b/tweeper.1.asciidoc +index 34de150..14051cc 100644 +--- a/tweeper.1.asciidoc ++++ b/tweeper.1.asciidoc +@@ -57,6 +57,19 @@ Using tweeper as a filter for the Liferea feed reader: + + liferea-add-feed "|tweeper http://twitter.com/NSAcareers" + ++Using tweeper via web (the symlink must be created only the very first time): ++ ++ sudo ln -s /usr/share/php/tweeper/tweeper.php /var/www ++ xdg-open http://localhost/tweeper.php?src_url=http://twitter.com/NSAcareers ++ ++ ++NOTES ++----- ++ ++In order to use tweeper with a symlink with the apache 'userdir' module, the ++'SymLinksIfOwnerMatch' option must be replaced by 'FollowSymlink' in ++/etc/apache2/mods-enabled/userdir.conf ++ + + EXIT STATUS + ----------- +-- +1.8.4.3 + diff --git a/debian/patches/0002-tweeper.1.asciidoc-reword-some-list-items.patch b/debian/patches/0002-tweeper.1.asciidoc-reword-some-list-items.patch new file mode 100644 index 0000000..90ca2b5 --- /dev/null +++ b/debian/patches/0002-tweeper.1.asciidoc-reword-some-list-items.patch @@ -0,0 +1,31 @@ +From 50ffc18d9a1bedd4196bc3cff616cd9ce7d26b5b Mon Sep 17 00:00:00 2001 +From: Antonio Ospite +Date: Wed, 20 Nov 2013 01:12:59 +0100 +Subject: [PATCH] tweeper.1.asciidoc: reword some list items +X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM/Vb;]yA5\I~93>J<_`<4)A{':UrE + +Remove the unneeded "as", it is in the list preamble already. +--- + tweeper.1.asciidoc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tweeper.1.asciidoc b/tweeper.1.asciidoc +index 14051cc..a57bedf 100644 +--- a/tweeper.1.asciidoc ++++ b/tweeper.1.asciidoc +@@ -32,8 +32,8 @@ The sites that tweeper is able to scrape and convert to RSS are: + tweeper can be used as: + + 1. a command line tool; +-2. as a filter for feed readers; +-3. as a web based tool when PHP support is available in the web server. ++2. a filter for feed readers; ++3. a web based tool when PHP support is available in the web server. + + + OPTIONS +-- +1.8.4.3 + diff --git a/debian/patches/0003-tweeper.php-support-generating-enclosure-for-audio-o.patch b/debian/patches/0003-tweeper.php-support-generating-enclosure-for-audio-o.patch new file mode 100644 index 0000000..94df0e1 --- /dev/null +++ b/debian/patches/0003-tweeper.php-support-generating-enclosure-for-audio-o.patch @@ -0,0 +1,27 @@ +From 759964ebb58bceb2ee871670b1d8df24bcb03f34 Mon Sep 17 00:00:00 2001 +From: Antonio Ospite +Date: Fri, 27 Dec 2013 09:32:25 +0100 +Subject: [PATCH] tweeper.php: support generating enclosure for "audio/ogg" +X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM/Vb;]yA5\I~93>J<_`<4)A{':UrE + +--- + tweeper.php | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tweeper.php b/tweeper.php +index 1d50f60..152069b 100644 +--- a/tweeper.php ++++ b/tweeper.php +@@ -91,6 +91,7 @@ class Tweeper { + "audio/aac", + "audio/mp4", + "audio/mpeg", ++ "audio/ogg", + "audio/vorbis", + "audio/wav", + "audio/webm", +-- +1.9.0.rc3 + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..8826c49 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +0001-tweeper.1.asciidoc-mention-a-way-to-use-tweeper-from.patch +0002-tweeper.1.asciidoc-reword-some-list-items.patch +0003-tweeper.php-support-generating-enclosure-for-audio-o.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..1eb817e --- /dev/null +++ b/debian/rules @@ -0,0 +1,10 @@ +#!/usr/bin/make -f + +%: + dh $@ + +override_dh_auto_install: + $(MAKE) DESTDIR=$(CURDIR)/debian/tweeper prefix=/usr install + +override_dh_installchangelogs: + dh_installchangelogs NEWS diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..617f05e --- /dev/null +++ b/debian/watch @@ -0,0 +1,5 @@ +version=3 + +opts=downloadurlmangle=s/shortlog\/refs\/tags\/(v[\d\.]+)/snapshot\/$1.tar.gz/,\ +filenamemangle=s/.*v([\d\.]+)$/tweeper-$1.tar.gz/ \ + http://git.ao2.it/tweeper.git/tags ^.*v([\d\.]+)