diff -u transmission-1.06/debian/changelog transmission-1.06/debian/changelog --- transmission-1.06/debian/changelog +++ transmission-1.06/debian/changelog @@ -1,3 +1,11 @@ +transmission (1.06-0ubuntu5) hardy; urgency=low + + * Add dpatch for pending bugfix patches + * 01-transmission-menu-name: Rename menu entry to "Transmission BitTorrent + Client", backported from 1.11 (LP: #184238) + + -- John Dong Tue, 08 Apr 2008 00:49:00 -0400 + transmission (1.06-0ubuntu4) hardy; urgency=low * Add missing X-Ubuntu-Gettext-Domain to gtk .desktop file diff -u transmission-1.06/debian/control transmission-1.06/debian/control --- transmission-1.06/debian/control +++ transmission-1.06/debian/control @@ -6,7 +6,7 @@ Uploaders: Leo Costela XS-DM-Upload-Allowed: yes Build-Depends: debhelper (>= 5), autotools-dev, libgtk2.0-dev, libevent-dev, - libglib2.0-dev, libssl-dev, chrpath, python, intltool + libglib2.0-dev, libssl-dev, chrpath, python, intltool, dpatch Standards-Version: 3.7.3 Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/transmission/ Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/transmission/ diff -u transmission-1.06/debian/rules transmission-1.06/debian/rules --- transmission-1.06/debian/rules +++ transmission-1.06/debian/rules @@ -1,6 +1,8 @@ #!/usr/bin/make -f # -*- makefile -*- +include /usr/share/dpatch/dpatch.make + # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -52,7 +54,7 @@ $(RM) config-stamp configure: configure-stamp -configure-stamp: +configure-stamp: patch dh_testdir ./configure \ @@ -74,7 +76,7 @@ # # touch config.status to prevent execution of autoconf [ ! -f Makefile ] || ( touch config.status && $(MAKE) distclean ) -clean: config-clean distclean +clean: config-clean distclean unpatch dh_testdir dh_testroot only in patch2: unchanged: --- transmission-1.06.orig/debian/patches/01-transmission-menu-name.dpatch +++ transmission-1.06/debian/patches/01-transmission-menu-name.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01-transmission-menu-name.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Rename the client to Transmission BitTorrent Client in the menu + +@DPATCH@ +diff -urNad transmission-1.06~/debian/transmission-gtk.menu transmission-1.06/debian/transmission-gtk.menu +--- transmission-1.06~/debian/transmission-gtk.menu 2008-04-08 00:45:24.000000000 -0400 ++++ transmission-1.06/debian/transmission-gtk.menu 2008-04-09 17:01:08.523695048 -0400 +@@ -1,3 +1,3 @@ + ?package(transmission-gtk):needs="X11" section="Applications/Network/File Transfer" \ +- title="Transmission" command="/usr/bin/transmission" \ ++ title="Transmission BitTorrent Client" command="/usr/bin/transmission" \ + icon="/usr/share/pixmaps/transmission.xpm" +diff -urNad transmission-1.06~/gtk/transmission.desktop.in transmission-1.06/gtk/transmission.desktop.in +--- transmission-1.06~/gtk/transmission.desktop.in 2008-04-08 00:45:24.000000000 -0400 ++++ transmission-1.06/gtk/transmission.desktop.in 2008-04-09 17:04:05.022165848 -0400 +@@ -1,7 +1,7 @@ + [Desktop Entry] +-_Name=Transmission ++_Name=Transmission BitTorrent Client + _GenericName=BitTorrent Client +-_Comment=Transfer files via Peer to Peer ++_Comment=Download and share files over BitTorrent + Exec=transmission %F + Icon=transmission + Terminal=false only in patch2: unchanged: --- transmission-1.06.orig/debian/patches/00list +++ transmission-1.06/debian/patches/00list @@ -0,0 +1,2 @@ +01-transmission-menu-name.dpatch +