diff -Nru transmission-2.84/debian/changelog transmission-2.84/debian/changelog --- transmission-2.84/debian/changelog 2015-01-06 20:49:28.000000000 +1100 +++ transmission-2.84/debian/changelog 2015-07-04 16:22:32.000000000 +1000 @@ -1,3 +1,26 @@ +transmission (2.84-1ubuntu1) wily; urgency=medium + + * Merge from Debian unstable (LP: #1235535). Remaining changes: + - debian/control: + + Build-depend on libappindicator3-dev + - debian/transmission-daemon.upstart: add upstart job + + -- Jackson Doak Sat, 04 Jul 2015 16:20:45 +1000 + +transmission (2.84-1) experimental; urgency=medium + + * Acknowledge NMUs: thanks to Boris Pek, Thomas Goirand, Markus Koschany; + Closes: #737366, #718624, #754982, #757365, #718624, #734467 + * [323b2ad] Set me as maintaner, Leo as uploader (with Leo's blessing) + * [3eecf54] removed Bugs field, as it was causing bugs to be sent to upstream; + Closes: #740944 + * [e5bd0af] drop gconf integration, no longer needed; Closes: #741069, + #745936, #756823 + * [0432bb4] bump Standards-Version to 3.9.6 (no changes needed) + * [fd2b694] transition to libsystemd-dev; Closes: #779760 + + -- Sandro Tosi Fri, 10 Apr 2015 11:21:31 +0100 + transmission (2.84-0.2ubuntu1) vivid; urgency=low * Merge from Debian unstable (LP: #1407241). Remaining changes: diff -Nru transmission-2.84/debian/control transmission-2.84/debian/control --- transmission-2.84/debian/control 2015-01-06 20:49:28.000000000 +1100 +++ transmission-2.84/debian/control 2015-07-04 16:21:08.000000000 +1000 @@ -2,6 +2,8 @@ Section: net Priority: optional Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Sandro Tosi +Uploaders: Leo Costela Build-Depends: autotools-dev, debhelper (>= 8), dh-autoreconf, @@ -16,17 +18,16 @@ libnatpmp-dev (>= 20110808), libnotify-dev (>= 0.7), libssl-dev, - libsystemd-daemon-dev [linux-any], + libsystemd-dev [linux-any], qt5-default, qt5-qmake, qtbase5-dev, qttools5-dev-tools, zlib1g-dev -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/transmission.git Vcs-Git: git://anonscm.debian.org/collab-maint/transmission.git Homepage: http://www.transmissionbt.com/ -Bugs: https://trac.transmissionbt.com/ Package: transmission Architecture: all diff -Nru transmission-2.84/debian/patches/series transmission-2.84/debian/patches/series --- transmission-2.84/debian/patches/series 2014-12-10 18:20:54.000000000 +1100 +++ transmission-2.84/debian/patches/series 2015-04-10 20:21:56.000000000 +1000 @@ -1,2 +1,3 @@ systemd_service_fixes.patch fix_freebsd_quota_include.patch +transition_to_libsystemd.patch diff -Nru transmission-2.84/debian/patches/transition_to_libsystemd.patch transmission-2.84/debian/patches/transition_to_libsystemd.patch --- transmission-2.84/debian/patches/transition_to_libsystemd.patch 1970-01-01 10:00:00.000000000 +1000 +++ transmission-2.84/debian/patches/transition_to_libsystemd.patch 2015-04-10 20:21:56.000000000 +1000 @@ -0,0 +1,33 @@ +Description: Transition to libsystemd + In systemd v209, released over a year ago, the various libsystemd-* libraries + (libsystemd-journal.so, libsystemd-login.so, libsystem-daemon.so, + libsystemd-id128.so) were merged into a single libsystemd.so library to reduce + code duplication and avoid cyclic dependencies +Author: Sandro Tosi +Origin: vendor +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779760 +Forwarded: no +Last-Update: 2015-04-04 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/configure.ac ++++ b/configure.ac +@@ -173,15 +173,15 @@ dnl + dnl file monitoring for the daemon + + # Check whether to enable systemd startup notification. +-# This requires libsystemd-daemon. ++# This requires libsystemd. + AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon], + [Add support for systemd startup notification (default is autodetected)]), + [USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto]) + AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [ +- PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon], ++ PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd], + [AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])], + [AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"], +- [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])] ++ [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd not found.])] + )] + ) + ]) diff -Nru transmission-2.84/debian/transmission-gtk.gconf-defaults transmission-2.84/debian/transmission-gtk.gconf-defaults --- transmission-2.84/debian/transmission-gtk.gconf-defaults 2014-12-10 18:20:54.000000000 +1100 +++ transmission-2.84/debian/transmission-gtk.gconf-defaults 1970-01-01 10:00:00.000000000 +1000 @@ -1,3 +0,0 @@ -/desktop/gnome/url-handlers/transmission-gtk/command "/usr/bin/transmission-gtk %s" -/desktop/gnome/url-handlers/transmission-gtk/enabled true -/desktop/gnome/url-handlers/transmission-gtk/needs_terminal false