diff -u transmission-1.34/debian/control transmission-1.34/debian/control --- transmission-1.34/debian/control +++ transmission-1.34/debian/control @@ -6,7 +6,7 @@ Uploaders: Philipp Benner XS-DM-Upload-Allowed: yes Build-Depends: debhelper (>= 7), autotools-dev, libgtk2.0-dev, libevent-dev, - libglib2.0-dev, libssl-dev, libcurl-dev, chrpath, python, intltool, libnotify-dev + libglib2.0-dev, libssl-dev, libcurl-dev, chrpath, python, intltool, libnotify-dev, dpatch Standards-Version: 3.8.0 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.34/debian/changelog transmission-1.34/debian/changelog --- transmission-1.34/debian/changelog +++ transmission-1.34/debian/changelog @@ -1,3 +1,15 @@ +transmission (1.34-0ubuntu2.1) intrepid-proposed; urgency=low + + * debian/control: Add build-depend on dpatch + * debian/patches: 10_fix_crasher_from_upstream.dpatch (LP: #274844) + - Fixes: transmission crashed with SIGSEGV in g_markup_escape_text() + - Backported from upstream: http://trac.transmissionbt.com/ticket/1314 + - Thanks to charles. + * debian/patches: 20_add_X-Ubuntu-Gettext-Domain.dpatch (LP: #290769) + - Re-add X-Ubuntu-Gettext-Domain to .desktop file + + -- Andrew Starr-Bochicchio Tue, 21 Oct 2008 11:30:06 -0400 + transmission (1.34-0ubuntu2) intrepid; urgency=low * Added replaces & provides clutch (now included as part of transmission) diff -u transmission-1.34/debian/rules transmission-1.34/debian/rules --- transmission-1.34/debian/rules +++ transmission-1.34/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 @@ -31,7 +33,7 @@ ################################################################################ config: config-stamp -config-stamp: +config-stamp: patch-stamp dh_testdir if [ -r /usr/share/misc/config.sub ] && [ ! -f config.sub.backup ]; then \ @@ -85,7 +87,7 @@ # # touch config.status to prevent execution of autoconf [ ! -f Makefile ] || ( touch config.status && $(MAKE) distclean ) -clean: config-clean distclean +clean: unpatch config-clean distclean dh_testdir dh_testroot only in patch2: unchanged: --- transmission-1.34.orig/debian/patches/10_fix_crasher_from_upstream.dpatch +++ transmission-1.34/debian/patches/10_fix_crasher_from_upstream.dpatch @@ -0,0 +1,157 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_fix_crasher_from_upstream.dpatch +## by Andrew Starr-Bochicchio +## +## DP: Fixes transmission crashed with SIGSEGV in g_markup_escape_text() +## DP: Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/transmission/+bug/274844 +## DP: Upstream: http://trac.transmissionbt.com/ticket/1314 +## DP: Backported from upstream svn to 1.34. Should be able to be dropped with next +## DP: upstream release. + +@DPATCH@ + +--- transmission-1.34/gtk/tr-window.c 2008-09-16 20:37:35.000000000 -0500 ++++ transmission-1.34-modified/gtk/tr-window.c 2008-10-21 09:56:32.000000000 -0500 +@@ -71,7 +71,6 @@ + + typedef struct + { +- GtkTooltips * tooltips; + GtkWidget * scroll; + GtkWidget * view; + GtkWidget * toolbar; +@@ -82,7 +81,6 @@ + GtkWidget * dl_lb; + GtkWidget * stats_lb; + GtkWidget * gutter_lb; +- GtkWidget * update_tracker_button; + GtkTreeSelection * selection; + GtkCellRenderer * renderer; + GtkTreeViewColumn * column; +@@ -227,6 +225,58 @@ + gtk_menu_popup( GTK_MENU( p->status_menu ), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time( ) ); + } + ++#if GTK_CHECK_VERSION(2,12,0 ) ++ ++static void ++findMaxAnnounceTime( GtkTreeModel * model, ++ GtkTreePath * path UNUSED, ++ GtkTreeIter * iter, ++ gpointer gmaxTime ) ++{ ++ tr_torrent * tor; ++ const tr_stat * torStat; ++ time_t * maxTime = gmaxTime; ++ ++ gtk_tree_model_get( model, iter, MC_TORRENT_RAW, &tor, -1 ); ++ torStat = tr_torrentStatCached( tor ); ++ *maxTime = MAX( *maxTime, torStat->manualAnnounceTime ); ++} ++ ++static gboolean ++onAskTrackerQueryTooltip( GtkWidget * widget UNUSED, ++ gint x UNUSED, ++ gint y UNUSED, ++ gboolean keyboard_tip UNUSED, ++ GtkTooltip * tooltip, ++ gpointer gdata ) ++{ ++ const time_t now = time( NULL ); ++ time_t maxTime = 0; ++ PrivateData * p = gdata; ++ ++ gtk_tree_selection_selected_foreach( p->selection, ++ findMaxAnnounceTime, ++ &maxTime ); ++ if( maxTime <= now ) ++ { ++ return FALSE; ++ } ++ else ++ { ++ char buf[128]; ++ char timebuf[64]; ++ const int seconds = maxTime - now; ++ ++ tr_strltime( timebuf, seconds, sizeof( timebuf ) ); ++ g_snprintf( buf, sizeof( buf ), ++ _( "Tracker will allow requests in %s" ), timebuf ); ++ gtk_tooltip_set_text( tooltip, buf ); ++ return TRUE; ++ } ++} ++ ++#endif ++ + #define STATS_MODE "stats-mode" + + static struct { +@@ -459,7 +509,10 @@ + w = action_get_widget( "/main-window-menu" ); + gtk_box_pack_start( GTK_BOX(vbox), w, FALSE, FALSE, 0 ); + w = action_get_widget( "/main-window-menu/torrent-menu/update-tracker" ); +- p->update_tracker_button = w; ++#if GTK_CHECK_VERSION( 2, 12, 0 ) ++ g_signal_connect( w, "query-tooltip", ++ G_CALLBACK( onAskTrackerQueryTooltip ), p ); ++#endif + + /* toolbar */ + w = p->toolbar = action_get_widget( "/main-window-toolbar" ); +@@ -653,46 +706,6 @@ + gtk_label_set_text( GTK_LABEL( p->ul_lb ), buf ); + } + +-static void +-findMaxAnnounceTime( GtkTreeModel * model, +- GtkTreePath * path UNUSED, +- GtkTreeIter * iter, +- gpointer gmaxTime ) +-{ +- tr_torrent * tor; +- const tr_stat * torStat; +- time_t * maxTime = gmaxTime; +- +- gtk_tree_model_get( model, iter, MC_TORRENT_RAW, &tor, -1 ); +- torStat = tr_torrentStatCached( tor ); +- *maxTime = MAX( *maxTime, torStat->manualAnnounceTime ); +-} +- +-static void +-updateAskForPeers( PrivateData * p ) +-{ +- char buf[128]; +- time_t maxTime = 0; +- const time_t now = time( NULL ); +- +- gtk_tree_selection_selected_foreach( p->selection, +- findMaxAnnounceTime, +- &maxTime ); +- +- if( maxTime <= now ) +- *buf = '\0'; +- else { +- char secbuf[32]; +- const int seconds = maxTime - time( NULL ); +- tr_strltime( secbuf, seconds, sizeof( secbuf ) ); +- g_snprintf( buf, sizeof( buf ), _( "Tracker will allow requests in %s" ), secbuf ); +- } +- +- if( !p->tooltips ) +- p->tooltips = gtk_tooltips_new( ); +- gtk_tooltips_set_tip( p->tooltips, p->update_tracker_button, buf, NULL ); +-} +- + void + tr_window_update( TrWindow * self ) + { +@@ -702,7 +715,6 @@ + updateSpeeds( p ); + updateTorrentCount( p ); + updateStats( p ); +- updateAskForPeers( p ); + refilter( p ); + } + } + only in patch2: unchanged: --- transmission-1.34.orig/debian/patches/00list +++ transmission-1.34/debian/patches/00list @@ -0,0 +1,2 @@ +10_fix_crasher_from_upstream.dpatch +20_add_X-Ubuntu-Gettext-Domain.dpatch only in patch2: unchanged: --- transmission-1.34.orig/debian/patches/20_add_X-Ubuntu-Gettext-Domain.dpatch +++ transmission-1.34/debian/patches/20_add_X-Ubuntu-Gettext-Domain.dpatch @@ -0,0 +1,15 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_add_X-Ubuntu-Gettext-Domain.dpatch +## by Andrew Starr-Bochicchio +## +## DP: Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/transmission/+bug/274844 + +@DPATCH@ + +--- transmission-1.34/gtk/transmission.desktop.in 2008-09-16 21:37:35.000000000 -0400 ++++ transmission-1.34-modified/gtk/transmission.desktop.in 2008-10-29 13:55:31.000000000 -0400 +@@ -9,3 +9,4 @@ + Type=Application + MimeType=application/x-bittorrent; + Categories=Network;FileTransfer;P2P;GTK; ++X-Ubuntu-Gettext-Domain=transmission