Source: transmission
Version: 2.03-1
Severity: wishlist
Tags: patch
There's a new upstream version available: 2.04. I took the liberty of
checking, and it builds fine with the current debian/ scripts etc.
According to the upstream logs, this fixes a few reasonably nasty bugs
present in 2.03.
As it turns out, I noticed this because I was making a minor patch to
add a "Not Paused" entry in the main transmission gtk+ window Show:
menu, just to scratch my own itch. While I was at it, I rewrote
debian/rules to use the new dh stuff along with other minor debian/*
modernization. I checked that the generated .debs have the same files
as with the old debian/rules & co, and they do.
Patch below, against 2.03-1. This contains my "not paused" show: menu
entry as a quilt patch, along with the shortened debian/rules and
associated tweaks.
Or, in case you want only some of this, bite-sized pieces are
available under version control.
git clone git://git.debian.org/~bap/transmission.git
Cheers,
--Barak.
PS Thanks for all your work maintaining the transmission package. It
is my favorite BT client.
--
Barak A. Pearlmutter
Hamilton Institute & Dept Comp Sci, NUI Maynooth, Co. Kildare, Ireland
http://www.bcl.hamilton.ie/~barak/
----------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 830092f..4703c97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+transmission (2.04-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * debian/patches:
+ - add nonpaused_menu patch
+ * debian/control:
+ - bump policy to 3.9.1
+ - dependencies for dh7 and quilt
+ * debian/rules:
+ - shorten using dh7 facilities and overrides
+
+ -- Barak A. Pearlmutter <[email protected]> Thu, 12 Aug 2010 21:10:43 +0200
+
transmission (2.03-1) unstable; urgency=low
* new upstream release
diff --git a/debian/control b/debian/control
index 1b26f38..b502417 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,12 @@ Priority: optional
Maintainer: Leo Costela <[email protected]>
Uploaders: Philipp Benner <[email protected]>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), autotools-dev, libgtk2.0-dev, libevent-dev
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libgtk2.0-dev,
libevent-dev
(>= 1.4), libglib2.0-dev, libnotify-dev, libssl-dev, libcurl4-dev |
libcurl-dev, chrpath, intltool (>= 0.40), qt4-qmake, libqt4-dev,
+ quilt (>= 0.46-7~)
# libcanberra-gtk-dev, libgconf2-dev
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/transmission/
Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/transmission/
Homepage: http://www.transmissionbt.com/
diff --git a/debian/patches/nonpaused_menu.patch
b/debian/patches/nonpaused_menu.patch
new file mode 100644
index 0000000..48e9fd4
--- /dev/null
+++ b/debian/patches/nonpaused_menu.patch
@@ -0,0 +1,28 @@
+--- transmission/gtk/filter.c
++++ transmission/gtk/filter.c
+@@ -589,6 +589,7 @@ enum
+ ACTIVITY_FILTER_SEEDING,
+ ACTIVITY_FILTER_ACTIVE,
+ ACTIVITY_FILTER_PAUSED,
++ ACTIVITY_FILTER_NONPAUSED,
+ ACTIVITY_FILTER_FINISHED,
+ ACTIVITY_FILTER_QUEUED,
+ ACTIVITY_FILTER_VERIFYING,
+@@ -634,6 +635,9 @@ test_torrent_activity( tr_torrent * tor, int type )
+ case ACTIVITY_FILTER_PAUSED:
+ return st->activity == TR_STATUS_STOPPED;
+
++ case ACTIVITY_FILTER_NONPAUSED:
++ return st->activity != TR_STATUS_STOPPED;
++
+ case ACTIVITY_FILTER_FINISHED:
+ return st->finished == TRUE;
+
+@@ -722,6 +726,7 @@ activity_filter_model_new( GtkTreeModel * tmodel )
+ { ACTIVITY_FILTER_DOWNLOADING, N_( "Downloading" ), GTK_STOCK_GO_DOWN
},
+ { ACTIVITY_FILTER_SEEDING, N_( "Seeding" ), GTK_STOCK_GO_UP },
+ { ACTIVITY_FILTER_PAUSED, N_( "Paused" ), GTK_STOCK_MEDIA_PAUSE },
++ { ACTIVITY_FILTER_NONPAUSED, N_( "Not Paused" ), GTK_STOCK_EXECUTE },
+ { ACTIVITY_FILTER_FINISHED, N_( "Finished" ), NULL },
+ { ACTIVITY_FILTER_QUEUED, N_( "Queued" ), NULL },
+ { ACTIVITY_FILTER_VERIFYING, N_( "Verifying" ), GTK_STOCK_REFRESH },
diff --git a/debian/patches/series b/debian/patches/series
index 83efe1f..57fb870 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
libnatpmp_freebsd_ftbfs.patch
+nonpaused_menu.patch
diff --git a/debian/rules b/debian/rules
index 908b29f..1ccda45 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,167 +1,42 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-CFLAGS = -Wall -g
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-# DEB_BUILD_OPTIONS
-################################################################################
-
-# noop
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += --ggdb3
-endif
-
-# parallel
-ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS)))
- TRANSMISSION_MAKEFLAGS += -j$(patsubst parallel=%,%,$(filter
parallel=%,$(DEB_BUILD_OPTIONS)))
-endif
-
-# nostrip is handled by dh_strip
-
-################################################################################
-
-config: config-stamp
-config-stamp:
- dh_testdir
-
- if [ -r /usr/share/misc/config.sub ] && [ ! -f config.sub.backup ];
then \
- mv -v config.sub config.sub.backup; \
- cp -f /usr/share/misc/config.sub $(CURDIR)/config.sub; \
- fi
-
- if [ -r /usr/share/misc/config.guess ] && [ ! -f config.guess.backup ];
then \
- mv -v config.guess config.guess.backup; \
- cp -f /usr/share/misc/config.guess $(CURDIR)/config.guess; \
- fi
-
- touch $@
-
-config-clean:
- dh_testdir
- dh_testroot
-
- if [ -f config.sub.backup ]; then \
- mv -fv config.sub.backup config.sub; \
- fi
-
- if [ -f config.guess.backup ]; then \
- mv -fv config.guess.backup config.guess; \
- fi
-
- $(RM) config-stamp
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
-
- ./configure \
- --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --disable-libcanberra --disable-libgconf \
- CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs,--as-needed"
+%:
+ dh $@ --with quilt
+override_dh_auto_configure:
+ dh_auto_configure -- --disable-libcanberra --disable-libgconf
# Qt client
( cd qt && qmake-qt4 qtr.pro )
- touch $@
-
-build: config build-stamp
-build-stamp: configure
- dh_testdir
-
- $(MAKE) $(TRANSMISSION_MAKEFLAGS)
-
+override_dh_auto_build:
+ dh_auto_build
# Qt client
- ( cd qt && $(MAKE) )
+ $(MAKE) -C qt
- touch $@
-
-distclean:
-# # touch config.status to prevent execution of autoconf
- [ ! -f Makefile ] || ( touch config.status && $(MAKE) distclean )
-
-clean: config-clean distclean
- dh_testdir
- dh_testroot
-
+override_dh_auto_clean:
+ dh_auto_clean
# QT client
- [ ! -f qt/Makefile ] || ( cd qt && $(MAKE) clean )
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ [ ! -f qt/Makefile ] || -$(MAKE) -C qt --ignore-errors --keep-going
clean
+override_dh_auto_install:
+ dh_auto_install
# Qt client
- ( cd qt && INSTALL_ROOT=$(CURDIR)/debian/tmp/usr $(MAKE) install )
-
+ $(MAKE) -C qt INSTALL_ROOT=$(CURDIR)/debian/tmp/usr install
# # clean RPATH from transmission binary (costela - 2007-10-27)
chrpath -d $(CURDIR)/debian/tmp/usr/bin/transmission
chrpath -d $(CURDIR)/debian/tmp/usr/bin/transmission-daemon
chrpath -d $(CURDIR)/debian/tmp/usr/bin/transmission-remote
chrpath -d $(CURDIR)/debian/tmp/usr/bin/transmissioncli
-UPSTREAM_VERSION=$(shell dpkg-parsechangelog | perl -ne '{ print $$1."\n" if
/Version: (.*)-.*/; }')
-
-get-orig-source:
- [ ! -f transmission-$(UPSTREAM_VERSION).tar.bz2 ] \
- && wget
http://download.m0k.org/transmission/files/transmission-$(UPSTREAM_VERSION).tar.bz2
+override_dh_installchangelogs:
+ dh_installchangelogs --package=transmission-common NEWS
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_link -i
- dh_installchangelogs -p transmission-common NEWS
- dh_installdocs -p transmission-common
- dh_installexamples -p transmission-common
- dh_install -i -X LICENSE # extra copy in web dir - costela 2008-08-15
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
+override_dh_installdocs:
+ dh_installdocs --package=transmission-common
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_link -a
- dh_installinit -a
- dh_installmenu -a
- dh_installman -a
- dh_installmime -a
- dh_install --list-missing -a
- dh_icons -a
- dh_strip -a
- dh_compress -a
- dh_fixperms -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
+override_dh_installexamples:
+ dh_installexamples --package=transmission-common
-binary: binary-indep binary-arch
-.PHONY: config config-clean configure build clean binary-indep binary-arch
binary install
+override_dh_install:
+ dh_install --indep --exclude=LICENSE # extra copy in web dir - costela
2008-08-15
+ dh_install --remaining-packages
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
