Hi Leo,
I have attached the commits which I have locally, in order to fix and
upload transmission 2.84-0.1. I didn't include
"0003-Upgraded-to-upstream-release-2.84.patch" because it's 13MB.
1/ Do you agree that I "git push" these changes?
2/ Do you agree if I NMU these changes, which are fixing the 2 RC bugs
currently opened against transmission?
Cheers,
Thomas Goirand (zigo)
>From fab1998a877c7eb54960dee464042425c83dc1b4 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <z...@debian.org>
Date: Fri, 18 Jul 2014 10:36:49 +0000
Subject: [PATCH 1/6] New upstream release (Closes: #754982)
---
debian/changelog | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 780b145..8a06649 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+transmission (2.84-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * New upstream release:
+ - Fixes build with newer miniupnpc (Closes: #754982).
+
+ -- Thomas Goirand <z...@debian.org> Fri, 18 Jul 2014 10:35:51 +0000
+
transmission (2.82-1.1) unstable; urgency=medium
* Non-maintainer upload.
--
2.0.1
>From 76de3471e3acc2e55ea53935e6809cd8bf004938 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <z...@debian.org>
Date: Fri, 18 Jul 2014 10:38:17 +0000
Subject: [PATCH 2/6] Ran wrap-and-sort.
---
debian/changelog | 1 +
debian/control | 74 ++++++++++++++++++++++++--------------
debian/copyright | 1 -
debian/transmission-cli.install | 2 +-
debian/transmission-common.install | 6 ++--
debian/transmission-daemon.install | 6 ++--
debian/transmission-gtk.install | 4 +--
debian/transmission-qt.install | 6 ++--
8 files changed, 61 insertions(+), 39 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8a06649..ed54140 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ transmission (2.84-0.1) unstable; urgency=medium
* Non-maintainer upload.
* New upstream release:
- Fixes build with newer miniupnpc (Closes: #754982).
+ * Ran wrap-and-sort.
-- Thomas Goirand <z...@debian.org> Fri, 18 Jul 2014 10:35:51 +0000
diff --git a/debian/control b/debian/control
index 30cfb4a..b28702e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,25 @@ Source: transmission
Section: net
Priority: optional
Maintainer: Leo Costela <cost...@debian.org>
-Build-Depends: debhelper (>= 8), autotools-dev, dh-autoreconf,
- dh-systemd [linux-any],
- libgtk-3-dev, libevent-dev (>= 2.0),
- libglib2.0-dev, libnotify-dev (>= 0.7), libssl-dev, zlib1g-dev,
- libcurl4-gnutls-dev | libcurl4-dev | libcurl-dev,
- intltool (>= 0.40),
- qt5-qmake, qtbase5-dev, qttools5-dev-tools, qt5-default,
- libminiupnpc-dev, libnatpmp-dev (>= 20110808),
- libsystemd-daemon-dev [linux-any],
-# buildflags.mk
- dpkg-dev (>= 1.16.1~),
-# libcanberra-gtk-dev
+Build-Depends: autotools-dev,
+ debhelper (>= 8),
+ dh-autoreconf,
+ dh-systemd [linux-any],
+ intltool (>= 0.40),
+ libcurl4-gnutls-dev | libcurl4-dev | libcurl-dev,
+ libevent-dev (>= 2.0),
+ libglib2.0-dev,
+ libgtk-3-dev,
+ libminiupnpc-dev,
+ libnatpmp-dev (>= 20110808),
+ libnotify-dev (>= 0.7),
+ libssl-dev,
+ libsystemd-daemon-dev [linux-any],
+ qt5-default,
+ qt5-qmake,
+ qtbase5-dev,
+ qttools5-dev-tools,
+ zlib1g-dev
Standards-Version: 3.9.5
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/transmission.git
Vcs-Git: git://anonscm.debian.org/collab-maint/transmission.git
@@ -22,10 +29,12 @@ Bugs: https://trac.transmissionbt.com/
Package: transmission
Architecture: all
-Depends: transmission-gtk (>= ${binary:Version}) | transmission-qt (>= ${binary:Version}) | transmission-cli (>= ${binary:Version}), transmission-common (>= ${binary:Version}), ${misc:Depends}
+Depends: transmission-common (>= ${binary:Version}),
+ transmission-gtk (>= ${binary:Version}) | transmission-qt (>= ${binary:Version}) | transmission-cli (>= ${binary:Version}),
+ ${misc:Depends}
Description: lightweight BitTorrent client
Transmission is a set of lightweight BitTorrent clients (in GUI, CLI
- and daemon form). All its incarnations feature a very simple, intuitive
+ and daemon form). All its incarnations feature a very simple, intuitive
interface on top on an efficient, cross-platform back-end.
.
This is just a metapackage depending on one of the front-end
@@ -34,7 +43,6 @@ Description: lightweight BitTorrent client
Package: transmission-common
Architecture: all
Depends: ${misc:Depends}
-# because of the usr/share/icons move to -common
Replaces: transmission-gtk (<< 2.10-1)
Breaks: transmission-gtk (<< 2.10-1)
Description: lightweight BitTorrent client (common files)
@@ -42,14 +50,19 @@ Description: lightweight BitTorrent client (common files)
and daemon form). All its incarnations feature a very simple, intuitive
interface on top on an efficient, cross-platform back-end.
.
- This package contains the common files for the different transmission
+ This package contains the common files for the different transmission
versions.
Package: transmission-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: ${misc:Depends}, transmission-cli, transmission-gtk, transmission-qt, transmission-daemon, transmission-common
+Depends: transmission-cli,
+ transmission-common,
+ transmission-daemon,
+ transmission-gtk,
+ transmission-qt,
+ ${misc:Depends}
Description: lightweight BitTorrent client (debug symbols)
Transmission is a set of lightweight BitTorrent clients (in GUI, CLI
and daemon form). All its incarnations feature a very simple, intuitive
@@ -61,13 +74,16 @@ Description: lightweight BitTorrent client (debug symbols)
Package: transmission-cli
Architecture: any
-Depends: ${shlibs:Depends}, transmission-common (= ${source:Version}), ${misc:Depends}
-Suggests: transmission-daemon (= ${binary:Version}), transmission-gtk (= ${binary:Version})
+Depends: transmission-common (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Suggests: transmission-daemon (= ${binary:Version}),
+ transmission-gtk (= ${binary:Version})
Replaces: transmission-daemon (<< 1.50-1)
Breaks: transmission-daemon (<< 1.50-1)
Description: lightweight BitTorrent client (command line programs)
Transmission is a set of lightweight BitTorrent clients (in GUI, CLI
- and daemon form). All its incarnations feature a very simple, intuitive
+ and daemon form). All its incarnations feature a very simple, intuitive
interface on top on an efficient, cross-platform back-end.
.
This package contains a (deprecated) stand-alone command-line client,
@@ -76,22 +92,26 @@ Description: lightweight BitTorrent client (command line programs)
Package: transmission-gtk
Architecture: any
-Depends: ${shlibs:Depends}, transmission-common (= ${source:Version}), ${misc:Depends}
+Depends: transmission-common (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Recommends: xdg-utils
Description: lightweight BitTorrent client (GTK+ interface)
Transmission is a set of lightweight BitTorrent clients (in GUI, CLI
- and daemon form). All its incarnations feature a very simple, intuitive
+ and daemon form). All its incarnations feature a very simple, intuitive
interface on top on an efficient, cross-platform back-end.
.
This package contains the GTK+ stand-alone client.
Package: transmission-qt
Architecture: any
-Depends: ${shlibs:Depends}, transmission-common (= ${source:Version}), ${misc:Depends}
+Depends: transmission-common (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Recommends: xdg-utils
Description: lightweight BitTorrent client (Qt interface)
Transmission is a set of lightweight BitTorrent clients (in GUI, CLI
- and daemon form). All its incarnations feature a very simple, intuitive
+ and daemon form). All its incarnations feature a very simple, intuitive
interface on top on an efficient, cross-platform back-end.
.
This package contains the Qt stand-alone client.
@@ -99,10 +119,12 @@ Description: lightweight BitTorrent client (Qt interface)
Package: transmission-daemon
Architecture: any
Pre-Depends: adduser
-Depends: ${shlibs:Depends}, transmission-common (= ${source:Version}), lsb-base (>= 3.0), ${misc:Depends}
+Depends: lsb-base (>= 3.0),
+ transmission-common (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Replaces: transmission-cli (<< 1.40-1)
Breaks: transmission-cli (<< 1.40-1)
-# moving transmission-remote to -cli
Recommends: transmission-cli (>= 1.50-1)
Description: lightweight BitTorrent client (daemon)
Transmission is a set of lightweight BitTorrent clients (in GUI, CLI
diff --git a/debian/copyright b/debian/copyright
index 2a6c8d6..e594cc0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -120,4 +120,3 @@ License: Expat
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-
diff --git a/debian/transmission-cli.install b/debian/transmission-cli.install
index a5e12f3..f0f6323 100644
--- a/debian/transmission-cli.install
+++ b/debian/transmission-cli.install
@@ -1,5 +1,5 @@
usr/bin/transmission-cli
-usr/bin/transmission-remote
usr/bin/transmission-create
usr/bin/transmission-edit
+usr/bin/transmission-remote
usr/bin/transmission-show
diff --git a/debian/transmission-common.install b/debian/transmission-common.install
index beaf347..c7bbff8 100644
--- a/debian/transmission-common.install
+++ b/debian/transmission-common.install
@@ -1,4 +1,4 @@
-usr/share/transmission/web
-usr/share/pixmaps
-usr/share/icons
debian/transmission.xpm usr/share/pixmaps
+usr/share/icons
+usr/share/pixmaps
+usr/share/transmission/web
diff --git a/debian/transmission-daemon.install b/debian/transmission-daemon.install
index 66df928..e9d6189 100644
--- a/debian/transmission-daemon.install
+++ b/debian/transmission-daemon.install
@@ -1,4 +1,4 @@
-usr/bin/transmission-daemon
-debian/settings.json etc/transmission-daemon
-debian/README.json etc/transmission-daemon
daemon/transmission-daemon.service lib/systemd/system
+debian/README.json etc/transmission-daemon
+debian/settings.json etc/transmission-daemon
+usr/bin/transmission-daemon
diff --git a/debian/transmission-gtk.install b/debian/transmission-gtk.install
index 05b7439..057e141 100644
--- a/debian/transmission-gtk.install
+++ b/debian/transmission-gtk.install
@@ -1,4 +1,4 @@
+debian/lintian/transmission-gtk usr/share/lintian/overrides
usr/bin/transmission-gtk
-usr/share/locale
usr/share/applications/transmission-gtk.desktop
-debian/lintian/transmission-gtk usr/share/lintian/overrides
+usr/share/locale
diff --git a/debian/transmission-qt.install b/debian/transmission-qt.install
index 3c2f7d3..df3b24c 100644
--- a/debian/transmission-qt.install
+++ b/debian/transmission-qt.install
@@ -1,4 +1,4 @@
-usr/bin/transmission-qt
-qt/transmission-qt.desktop usr/share/applications/
-qt/translations/*.qm usr/share/qt4/translations/
debian/lintian/transmission-qt usr/share/lintian/overrides
+qt/translations/*.qm usr/share/qt4/translations/
+qt/transmission-qt.desktop usr/share/applications/
+usr/bin/transmission-qt
--
2.0.1
>From fe2a17d9886da50a537c1e0c66c924b9b15eb13e Mon Sep 17 00:00:00 2001
From: Thomas Goirand <z...@debian.org>
Date: Fri, 18 Jul 2014 10:53:48 +0000
Subject: [PATCH 4/6] Refresh fix_freebsd_quota_include.patch.
---
debian/changelog | 2 ++
debian/patches/fix_freebsd_quota_include.patch | 16 +++++++---------
debian/patches/systemd_service_fixes.patch | 26 ++++++++++++++++++++------
3 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ed54140..aed09f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ transmission (2.84-0.1) unstable; urgency=medium
* New upstream release:
- Fixes build with newer miniupnpc (Closes: #754982).
* Ran wrap-and-sort.
+ * Fix upstream service file (Closes: #718624).
+ * Refresh fix_freebsd_quota_include.patch.
-- Thomas Goirand <z...@debian.org> Fri, 18 Jul 2014 10:35:51 +0000
diff --git a/debian/patches/fix_freebsd_quota_include.patch b/debian/patches/fix_freebsd_quota_include.patch
index 1b36c49..f4dc445 100644
--- a/debian/patches/fix_freebsd_quota_include.patch
+++ b/debian/patches/fix_freebsd_quota_include.patch
@@ -1,17 +1,15 @@
-Index: repo/libtransmission/platform-quota.c
-===================================================================
---- repo.orig/libtransmission/platform-quota.c 2013-08-10 00:18:17.606024533 +0200
-+++ repo/libtransmission/platform-quota.c 2013-08-10 00:18:17.586024674 +0200
-@@ -18,7 +18,7 @@
+--- a/libtransmission/platform-quota.c
++++ b/libtransmission/platform-quota.c
+@@ -15,7 +15,7 @@
#ifndef WIN32
#include <sys/types.h> /* types needed by quota.h */
- #if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
#include <ufs/ufs/quota.h> /* quotactl() */
- #elif defined (__sun)
- #include <sys/fs/ufs_quota.h> /* quotactl */
-@@ -203,7 +203,7 @@
+ #elif defined (__NetBSD__)
+ #include <sys/param.h>
+@@ -246,7 +246,7 @@ getquota (const char * device)
int64_t freespace;
int64_t spaceused;
@@ -20,7 +18,7 @@ Index: repo/libtransmission/platform-quota.c
if (quotactl(device, QCMD(Q_GETQUOTA, USRQUOTA), getuid(), (caddr_t) &dq) == 0)
{
#elif defined(__sun)
-@@ -235,7 +235,7 @@
+@@ -278,7 +278,7 @@ getquota (const char * device)
/* No quota enabled for this user */
return -1;
}
diff --git a/debian/patches/systemd_service_fixes.patch b/debian/patches/systemd_service_fixes.patch
index 66ce5f2..e8500bf 100644
--- a/debian/patches/systemd_service_fixes.patch
+++ b/debian/patches/systemd_service_fixes.patch
@@ -1,13 +1,27 @@
-Index: repo/daemon/transmission-daemon.service
-===================================================================
---- repo.orig/daemon/transmission-daemon.service 2013-07-27 21:34:53.524172453 +0200
-+++ repo/daemon/transmission-daemon.service 2013-09-15 00:51:18.100530232 +0200
-@@ -3,7 +3,7 @@
+Description: fix segfaults due to wrong systemd service file
+ The service file has the following line:
+ User=transmission
+ .
+ It should be replaced with:
+ User=debian-transmission
+ .
+ Moreover, the type is set to "notify", but it never sends a signal, so systemd
+ kills it. Until this has been explained, this line should be removed.
+Author: Adrien CLERC <bugs-deb...@antipoul.fr>
+Bug-Debian: https://bugs.debian.org/718624
+Origin: other, https://bugs.debian.org/718624
+Forwarded: no
+Last-Update: 2014-07-18
+
+--- transmission-2.84.orig/daemon/transmission-daemon.service
++++ transmission-2.84/daemon/transmission-daemon.service
+@@ -3,8 +3,7 @@ Description=Transmission BitTorrent Daem
After=network.target
[Service]
-User=transmission
+-Type=notify
+User=debian-transmission
- Type=notify
ExecStart=/usr/bin/transmission-daemon -f --log-error
+ ExecReload=/bin/kill -s HUP $MAINPID
--
2.0.1
>From 70fb41b61dcae169ee644068b3735deb7ffc6aca Mon Sep 17 00:00:00 2001
From: Thomas Goirand <z...@debian.org>
Date: Fri, 18 Jul 2014 11:13:38 +0000
Subject: [PATCH 5/6] Minimum version of libminiupnpc-dev is now >= 1.9.
---
debian/changelog | 1 +
debian/control | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index aed09f8..0b14ce3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ transmission (2.84-0.1) unstable; urgency=medium
* Ran wrap-and-sort.
* Fix upstream service file (Closes: #718624).
* Refresh fix_freebsd_quota_include.patch.
+ * Minimum version of libminiupnpc-dev is now >= 1.9.
-- Thomas Goirand <z...@debian.org> Fri, 18 Jul 2014 10:35:51 +0000
diff --git a/debian/control b/debian/control
index b28702e..cc83ab5 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: autotools-dev,
libevent-dev (>= 2.0),
libglib2.0-dev,
libgtk-3-dev,
- libminiupnpc-dev,
+ libminiupnpc-dev (>= 1.9),
libnatpmp-dev (>= 20110808),
libnotify-dev (>= 0.7),
libssl-dev,
--
2.0.1
>From 1f4d8f1c7c5ee04b6a2fc95d56121703cb7f4341 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <z...@debian.org>
Date: Fri, 18 Jul 2014 11:18:44 +0000
Subject: [PATCH 6/6] Removed debian/gbp.conf which imposes bzip2 when upstream
releases source using xz compression.
---
debian/changelog | 2 ++
debian/gbp.conf | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
delete mode 100644 debian/gbp.conf
diff --git a/debian/changelog b/debian/changelog
index 0b14ce3..b44add9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ transmission (2.84-0.1) unstable; urgency=medium
* Fix upstream service file (Closes: #718624).
* Refresh fix_freebsd_quota_include.patch.
* Minimum version of libminiupnpc-dev is now >= 1.9.
+ * Removed debian/gbp.conf which imposes bzip2 when upstream releases source
+ using xz compression.
-- Thomas Goirand <z...@debian.org> Fri, 18 Jul 2014 10:35:51 +0000
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index 154ada1..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[DEFAULT]
-compression = bzip2
--
2.0.1
