diff -u transmission-1.40/debian/changelog transmission-1.40/debian/changelog --- transmission-1.40/debian/changelog +++ transmission-1.40/debian/changelog @@ -1,3 +1,48 @@ +transmission (1.40-2ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #305298), remaining changes: + - debian/control: + - Don't just build-depend on libcurl-dev, which is + a virtual package. + - Added replaces & provides clutch (now included as part of transmission). + - Build-depends on quilt. + - debian/rules: + - Uncommented "include /usr/share/quilt/quilt.make". + - Added patch/unpatch targets for Quilt. + - Create a PO template during package build. + - debian/transmission-daemon.postinst: Corrected dpkg-statoverride call + - 20_add_X-Ubuntu-Gettext-Domain.diff: Add X-Ubuntu-Gettext-Domain + to .desktop file. + * Converted patch system from dpatch to quilt. + + -- Chris Coulson Tue, 09 Dec 2008 18:34:12 +0000 + +transmission (1.40-2) unstable; urgency=low + + * debian/transmission-daemon.postinst: add --group to adduser call + and add workaround for the lack of the flag in 1.40-1 (closes: #507766) + * debian/control: make transmission-cli recommend transmission-daemon, + instead of depending + * debian/transmission-daemon.init: add --retry to stop action to avoid + race condition during install + + -- Leo Costela Thu, 04 Dec 2008 13:54:19 +0100 + +transmission (1.40-1) unstable; urgency=low + + * New upstream release (closes: #505846) + - No longer re-download parts unnecessarily (closes: #500971) + - badwidth limit code rewritten (closes: #495693) + * debian/control: + - added transmission-gtk Recommends on xdg-utils (closes: #497978) + - separated transmission-daemon package (closes: #503744) + - added "Replaces: transmission-cli" to daemon package + - added intltool build-dep + - remove "free" from short description (it's in main, that's redundant) + * added initscript for the daemon (closes: #503961) + + -- Leo Costela Sun, 16 Nov 2008 14:54:12 +0100 + transmission (1.40-0ubuntu1) jaunty; urgency=low * New upstream release (LP: #302672) @@ -31,6 +76,15 @@ -- Chris Coulson Fri, 28 Nov 2008 15:33:48 +0000 +transmission (1.34-1) unstable; urgency=low + + * New upstream release (closes: #499851) + * debian/{rules,control,patches}: removed patch added on last upload (since + I already messed up uploading a new version to unstable, might as well + keep it up-to-date) + + -- Leo Costela Sun, 12 Oct 2008 18:01:20 +0200 + transmission (1.34-0ubuntu2.1) intrepid-proposed; urgency=low * debian/control: Add build-depend on dpatch @@ -57,6 +111,21 @@ -- Chris Coulson Wed, 17 Sep 2008 17:25:51 +0100 +transmission (1.33-2) unstable; urgency=low + + * debian/rules: add quilt patch support + * debian/control: add build-dep on quilt + * debian/patches/rev_6749.diff: Backport fix for memory leak + (closes: #499828) + + -- Leo Costela Mon, 22 Sep 2008 22:47:32 +0200 + +transmission (1.33-1) unstable; urgency=low + + * New upstream release (Closes: #496325) + + -- Leo Costela Mon, 25 Aug 2008 00:45:34 +0200 + transmission (1.33-0ubuntu1) intrepid; urgency=low * New upstream release (LP: #260370) diff -u transmission-1.40/debian/transmission-cli.manpages transmission-1.40/debian/transmission-cli.manpages --- transmission-1.40/debian/transmission-cli.manpages +++ transmission-1.40/debian/transmission-cli.manpages @@ -2,2 +1,0 @@ -debian/tmp/usr/share/man/man1/transmission-daemon.1 -debian/tmp/usr/share/man/man1/transmission-remote.1 diff -u transmission-1.40/debian/transmission-cli.install transmission-1.40/debian/transmission-cli.install --- transmission-1.40/debian/transmission-cli.install +++ transmission-1.40/debian/transmission-cli.install @@ -2,2 +1,0 @@ -usr/bin/transmission-daemon -usr/bin/transmission-remote diff -u transmission-1.40/debian/rules transmission-1.40/debian/rules --- transmission-1.40/debian/rules +++ transmission-1.40/debian/rules @@ -1,11 +1,11 @@ #!/usr/bin/make -f # -*- makefile -*- -include /usr/share/dpatch/dpatch.make - # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +include /usr/share/quilt/quilt.make + CFLAGS = -Wall -g # These are used for cross-compiling and for saving the configure script @@ -33,7 +33,7 @@ ################################################################################ config: config-stamp -config-stamp: patch-stamp +config-stamp: patch dh_testdir if [ -r /usr/share/misc/config.sub ] && [ ! -f config.sub.backup ]; then \ @@ -91,11 +91,6 @@ dh_testdir dh_testroot -# # - $(RM) third-party/libevent/test/regress.gen.c - $(RM) third-party/libevent/test/regress.gen.h -# # - dh_clean install: build @@ -151,6 +146,7 @@ dh_testroot dh_link -a dh_install -a + dh_installinit -a dh_installmenu -a dh_installman -a dh_installmime -a diff -u transmission-1.40/debian/control transmission-1.40/debian/control --- transmission-1.40/debian/control +++ transmission-1.40/debian/control @@ -6,8 +6,8 @@ Uploaders: Philipp Benner XS-DM-Upload-Allowed: yes Build-Depends: debhelper (>= 7), autotools-dev, libgtk2.0-dev, libevent-dev, - libglib2.0-dev, libssl-dev, libcurl4-gnutls-dev | libcurl4-openssl-dev | libcurl-dev, - chrpath, python, intltool, libnotify-dev, dpatch + libglib2.0-dev, libnotify-dev, libssl-dev, libcurl4-gnutls-dev | libcurl4-openssl-dev | libcurl-dev, chrpath, python, intltool (>= 0.23), + quilt Standards-Version: 3.8.0 Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/transmission/ Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/transmission/ @@ -18,7 +18,7 @@ Depends: transmission-cli (>= ${binary:Version}), transmission-gtk (>= ${binary:Version}), transmission-common (= ${source:Version}) Replaces: clutch Provides: clutch -Description: free, lightweight BitTorrent client +Description: lightweight BitTorrent client Transmission is a simple BitTorrent client. It features a very simple, intuitive interface (gui and command-line) on top on an efficient, cross-platform back-end. @@ -27,7 +27,7 @@ Package: transmission-common Architecture: all -Description: free, lightweight BitTorrent client +Description: lightweight BitTorrent client (common files) Transmission is a simple BitTorrent client. It features a very simple, intuitive interface (gui and command-line) on top on an efficient, cross-platform back-end. @@ -37,8 +37,9 @@ Package: transmission-cli Architecture: any Depends: ${shlibs:Depends}, transmission-common (= ${source:Version}) +Recommends: transmission-daemon (= ${binary:Version}) Replaces: transmission (<< 0.6.1.dfsg-2) -Description: free, lightweight BitTorrent client (command line interface) +Description: lightweight BitTorrent client (command line interface) Transmission-cli is a lightweight command-line BitTorrent client. It features a very simple, intuitive interface on top on an efficient, cross-platform back-end. @@ -49,5 +50,19 @@ +Recommends: xdg-utils Replaces: transmission (<< 0.6.1.dfsg-2) -Description: free, lightweight BitTorrent client (graphical interface) +Description: lightweight BitTorrent client (graphical interface) Transmission-gtk is a GTK-based BitTorrent client. It features a very simple, intuitive interface on top on an efficient, cross-platform back-end. + +Package: transmission-daemon +Architecture: any +Pre-Depends: adduser +Depends: ${shlibs:Depends}, transmission-common (= ${source:Version}), lsb-base (>= 3.0) +Replaces: transmission-cli (<< 1.40-1) +Description: lightweight BitTorrent client (daemon) + Transmission is a simple BitTorrent client. It features a very simple, + intuitive interface (gui and command-line) on top on an efficient, + cross-platform back-end. + . + This package contains the transmission-daemon and the associated control + interface, transmission-remote. reverted: --- transmission-1.40/debian/patches/20_add_X-Ubuntu-Gettext-Domain.dpatch +++ transmission-1.40.orig/debian/patches/20_add_X-Ubuntu-Gettext-Domain.dpatch @@ -1,15 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 20_add_X-Ubuntu-Gettext-Domain.dpatch -## by Andrew Starr-Bochicchio -## -## DP: Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/transmission/+bug/274844 - -@DPATCH@ - ---- transmission-1.34/gtk/transmission.desktop.in 2008-09-16 21:37:35.000000000 -0400 -+++ transmission-1.34-modified/gtk/transmission.desktop.in 2008-10-29 13:55:31.000000000 -0400 -@@ -9,3 +9,4 @@ - Type=Application - MimeType=application/x-bittorrent; - Categories=Network;FileTransfer;P2P;GTK; -+X-Ubuntu-Gettext-Domain=transmission reverted: --- transmission-1.40/debian/patches/00list +++ transmission-1.40.orig/debian/patches/00list @@ -1 +0,0 @@ -20_add_X-Ubuntu-Gettext-Domain.dpatch only in patch2: unchanged: --- transmission-1.40.orig/debian/transmission-daemon.postinst +++ transmission-1.40/debian/transmission-daemon.postinst @@ -0,0 +1,29 @@ +#!/bin/sh + +set -e + +test $DEBIAN_SCRIPT_DEBUG && set -v -x + +case "$1" in + configure|upgrade) + if getent passwd debian-transmission > /dev/null; then + if ! getent group debian-transmission > /dev/null; then + addgroup --system --quiet debian-transmission #fix for missing --group adduser call in 1.40-1 + fi + else + adduser --system --group --no-create-home --quiet debian-transmission + fi + + if ! dpkg-statoverride --list /var/lib/transmission-daemon/info > /dev/null ; then + dpkg-statoverride --quiet --update --add debian-transmission debian-transmission 4750 /var/lib/transmission-daemon/info + fi + + if ! dpkg-statoverride --list /var/lib/transmission-daemon/downloads > /dev/null ; then + dpkg-statoverride --quiet --update --add debian-transmission debian-transmission 4775 /var/lib/transmission-daemon/downloads + fi + ;; +esac + +#DEBHELPER# + +exit 0; only in patch2: unchanged: --- transmission-1.40.orig/debian/transmission-daemon.links +++ transmission-1.40/debian/transmission-daemon.links @@ -0,0 +1,2 @@ +usr/share/doc/transmission-common usr/share/doc/transmission-daemon +var/lib/transmission-daemon/settings.json etc/transmission-daemon/settings.json only in patch2: unchanged: --- transmission-1.40.orig/debian/transmission-daemon.postrm +++ transmission-1.40/debian/transmission-daemon.postrm @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +case "$1" in + remove|purge) + getent passwd debian-transmission > /dev/null 2>&1 && deluser --system --quiet debian-transmission + dpkg-statoverride --quiet --remove /var/lib/transmission-daemon/info || true + dpkg-statoverride --quiet --remove /var/lib/transmission-daemon/downloads || true + ;; +esac + +#DEBHELPER# only in patch2: unchanged: --- transmission-1.40.orig/debian/transmission-daemon.init +++ transmission-1.40/debian/transmission-daemon.init @@ -0,0 +1,69 @@ +#!/bin/sh -e +### BEGIN INIT INFO +# Provides: transmission-daemon +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start or stop the transmission-daemon. +### END INIT INFO + +NAME=transmission-daemon +DAEMON=/usr/bin/$NAME +USER=debian-transmission +# FIXME: no pidfile support; forks, so --make-pidfile doesn't work either +#PIDFILE=/var/run/$NAME.pid + +[ -x $DAEMON ] || exit 0 + +[ -e /etc/default/$NAME ] && . /etc/default/$NAME + +. /lib/lsb/init-functions + +start_daemon () { + if [ $ENABLE_DAEMON != 1 ]; then + log_progress_msg "(disabled, see /etc/default/${NAME})" + else + start-stop-daemon --start \ + --chuid $USER \ + --exec $DAEMON -- $OPTIONS + fi +} + +case "$1" in + start) + log_daemon_msg "Starting bittorrent daemon" "$NAME" + start_daemon + log_end_msg 0 + ;; + stop) + log_daemon_msg "Stopping bittorrent daemon" "$NAME" + start-stop-daemon --stop --quiet \ + --exec $DAEMON --retry 2 \ + --oknodo + log_end_msg 0 + ;; + reload|force-reload) + log_daemon_msg "Reloading bittorrent daemon" "$NAME" + start-stop-daemon --stop --quiet \ + --exec $DAEMON \ + --oknodo --signal 1 + log_end_msg 0 + ;; + restart) + log_daemon_msg "Restarting bittorrent daemon" "$NAME" + start-stop-daemon --stop --quiet \ + --exec $DAEMON \ + --oknodo + sleep 1 + start_daemon + log_end_msg 0 + ;; + *) + echo "Usage: /etc/init.d/$NAME {start|stop|reload|force-reload|restart}" + exit 2 + ;; +esac + +exit 0 + only in patch2: unchanged: --- transmission-1.40.orig/debian/settings.json +++ transmission-1.40/debian/settings.json @@ -0,0 +1,18 @@ +{ + "blocklist-enabled": 0, + "download-dir": "\/var\/lib\/transmission-daemon\/downloads", + "download-limit": 100, + "download-limit-enabled": 0, + "encryption": 1, + "max-peers-global": 200, + "peer-port": 51413, + "pex-enabled": 1, + "port-forwarding-enabled": 0, + "rpc-authentication-required": 1, + "rpc-password": "transmission", + "rpc-port": 9091, + "rpc-username": "transmission", + "rpc-whitelist": "127.0.0.1", + "upload-limit": 100, + "upload-limit-enabled": 0 +} only in patch2: unchanged: --- transmission-1.40.orig/debian/transmission-daemon.manpages +++ transmission-1.40/debian/transmission-daemon.manpages @@ -0,0 +1,2 @@ +debian/tmp/usr/share/man/man1/transmission-daemon.1 +debian/tmp/usr/share/man/man1/transmission-remote.1 only in patch2: unchanged: --- transmission-1.40.orig/debian/transmission-daemon.install +++ transmission-1.40/debian/transmission-daemon.install @@ -0,0 +1,3 @@ +usr/bin/transmission-daemon +usr/bin/transmission-remote +debian/settings.json var/lib/transmission-daemon/info only in patch2: unchanged: --- transmission-1.40.orig/debian/transmission-daemon.dirs +++ transmission-1.40/debian/transmission-daemon.dirs @@ -0,0 +1,3 @@ +/var/lib/transmission-daemon/info +/var/lib/transmission-daemon/downloads +/etc/transmission-daemon only in patch2: unchanged: --- transmission-1.40.orig/debian/transmission-daemon.default +++ transmission-1.40/debian/transmission-daemon.default @@ -0,0 +1,11 @@ +# defaults for transmission-daemon +# sourced by /etc/init.d/transmission-daemon + +# change to 1 to enable daemon +ENABLE_DAEMON=1 + +# this directory stores some runtime information, like torrent files and config +CONFIG_DIR="/var/lib/transmission-daemon/info" + +# default options for daemon, see transmission-daemon(1) for mor options +OPTIONS="--auth --config-dir $CONFIG_DIR" only in patch2: unchanged: --- transmission-1.40.orig/debian/patches/series +++ transmission-1.40/debian/patches/series @@ -0,0 +1 @@ +20_add_X-Ubuntu-Gettext-Domain.diff only in patch2: unchanged: --- transmission-1.40.orig/debian/patches/20_add_X-Ubuntu-Gettext-Domain.diff +++ transmission-1.40/debian/patches/20_add_X-Ubuntu-Gettext-Domain.diff @@ -0,0 +1,9 @@ +Index: transmission-1.40-2ubuntu1/gtk/transmission.desktop.in +=================================================================== +--- transmission-1.40-2ubuntu1.orig/gtk/transmission.desktop.in 2008-12-09 18:57:13.000000000 +0000 ++++ transmission-1.40-2ubuntu1/gtk/transmission.desktop.in 2008-12-09 18:58:54.000000000 +0000 +@@ -9,3 +9,4 @@ + Type=Application + MimeType=application/x-bittorrent; + Categories=Network;FileTransfer;P2P;GTK; ++X-Ubuntu-Gettext-Domain=transmission