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,44 @@ +transmission (1.40-5ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #309597), 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. + - 20_add_X-Ubuntu-Gettext-Domain.diff: Add X-Ubuntu-Gettext-Domain + to .desktop file. + + -- Andrew Starr-Bochicchio Tue, 16 Dec 2008 12:04:55 +0000 + +transmission (1.40-5) unstable; urgency=low + + * debian/transmission-daemon.{links,install}: fix the conf link + (closes: #508750) + * debian/transmission-daemon.preinst: add workaround for old configs + in /var/lib/transmission-daemon/info + * debian/transmission-daemon.postrm: add cleanup for /var/lib/ dirs on + purge + + -- Leo Costela Sun, 15 Dec 2008 16:46:47 +0100 + +transmission (1.40-4) unstable; urgency=low + + * debian/transmission-daemon.init: add forgotten --retry in restart action + (closes: #508718) + + -- Leo Costela Sun, 14 Dec 2008 18:50:40 +0100 + +transmission (1.40-3) unstable; urgency=low + + * debian/transmission-daemon.postinst: fix copy/paste error (closes: #508310) + + -- Leo Costela Tue, 09 Dec 2008 22:28:24 +0100 + transmission (1.40-2ubuntu1) jaunty; urgency=low * Merge from debian unstable (LP: #305298), remaining changes: diff -u transmission-1.40/debian/transmission-daemon.postinst transmission-1.40/debian/transmission-daemon.postinst --- transmission-1.40/debian/transmission-daemon.postinst +++ transmission-1.40/debian/transmission-daemon.postinst @@ -21,6 +21,10 @@ 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 + + if ! dpkg-statoverride --list /etc/transmission-daemon/settings.json > /dev/null ; then + dpkg-statoverride --quiet --update --add debian-transmission debian-transmission 4750 /etc/transmission-daemon/settings.json + fi ;; esac diff -u transmission-1.40/debian/transmission-daemon.postrm transmission-1.40/debian/transmission-daemon.postrm --- transmission-1.40/debian/transmission-daemon.postrm +++ transmission-1.40/debian/transmission-daemon.postrm @@ -4,9 +4,13 @@ case "$1" in remove|purge) + if [ "$1" = "purge" -a -d /var/lib/transmission-daemon/info ]; then + rm -rf /var/lib/transmission-daemon/info/* + fi 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 + dpkg-statoverride --quiet --remove /etc/transmission-daemon/settings.json || true ;; esac diff -u transmission-1.40/debian/transmission-daemon.links transmission-1.40/debian/transmission-daemon.links --- transmission-1.40/debian/transmission-daemon.links +++ transmission-1.40/debian/transmission-daemon.links @@ -2 +2 @@ -var/lib/transmission-daemon/settings.json etc/transmission-daemon/settings.json +etc/transmission-daemon/settings.json var/lib/transmission-daemon/info/settings.json diff -u transmission-1.40/debian/transmission-daemon.dirs transmission-1.40/debian/transmission-daemon.dirs --- transmission-1.40/debian/transmission-daemon.dirs +++ transmission-1.40/debian/transmission-daemon.dirs @@ -3 +2,0 @@ -/etc/transmission-daemon diff -u transmission-1.40/debian/transmission-daemon.install transmission-1.40/debian/transmission-daemon.install --- transmission-1.40/debian/transmission-daemon.install +++ transmission-1.40/debian/transmission-daemon.install @@ -3 +3 @@ -debian/settings.json var/lib/transmission-daemon/info +debian/settings.json etc/transmission-daemon diff -u transmission-1.40/debian/transmission-daemon.init transmission-1.40/debian/transmission-daemon.init --- transmission-1.40/debian/transmission-daemon.init +++ transmission-1.40/debian/transmission-daemon.init @@ -13,6 +13,7 @@ USER=debian-transmission # FIXME: no pidfile support; forks, so --make-pidfile doesn't work either #PIDFILE=/var/run/$NAME.pid +STOP_TIMEOUT=3 [ -x $DAEMON ] || exit 0 @@ -39,23 +40,22 @@ stop) log_daemon_msg "Stopping bittorrent daemon" "$NAME" start-stop-daemon --stop --quiet \ - --exec $DAEMON --retry 2 \ + --exec $DAEMON --retry $STOP_TIMEOUT \ --oknodo log_end_msg 0 ;; - reload|force-reload) + reload) log_daemon_msg "Reloading bittorrent daemon" "$NAME" start-stop-daemon --stop --quiet \ --exec $DAEMON \ --oknodo --signal 1 log_end_msg 0 ;; - restart) + restart|force-reload) log_daemon_msg "Restarting bittorrent daemon" "$NAME" start-stop-daemon --stop --quiet \ - --exec $DAEMON \ + --exec $DAEMON --retry $STOP_TIMEOUT \ --oknodo - sleep 1 start_daemon log_end_msg 0 ;; only in patch2: unchanged: --- transmission-1.40.orig/debian/transmission-daemon.preinst +++ transmission-1.40/debian/transmission-daemon.preinst @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +test $DEBIAN_SCRIPT_DEBUG && set -v -x + +case "$1" in + configure|upgrade) + # Workaround for conffile messup pre-1.40-5. + # The explicit readlink comparison is necessary because of yet + # another error on my part (forgot the "info" subdir on 1.40-4). + # costela - 2008-12-15 + LIB_SETTINGS=/var/lib/transmission-daemon/info/settings.json + ETC_SETTINGS=/etc/transmission-daemon/settings.json + if [ -f $LIB_SETTINGS -a -L $ETC_SETTINGS -a \( $LIB_SETTINGS -ef $ETC_SETTINGS -o "$(readlink $ETC_SETTINGS)" = "/var/lib/transmission-daemon/settings.json" \) ]; then + rm $ETC_SETTINGS + cp -pf $LIB_SETTINGS $ETC_SETTINGS + fi + ;; +esac + +#DEBHELPER# + +exit 0;