Ubuntu
transmission package

Merge lp:~jbicha/ubuntu/oneiric/transmission/transmission-2.33 into lp:ubuntu/oneiric/transmission

  1. Oneiric (11.10)
  2. transmission-2.33
  3. Merge into oneiric
Proposed by Jeremy Bícha
Status: Merged
Merged at revision: 70
Proposed branch: lp:~jbicha/ubuntu/oneiric/transmission/transmission-2.33
Merge into: lp:ubuntu/oneiric/transmission
Diff against target: 180 lines (+49/-33)
2 files modified
debian/changelog (+7/-0)
debian/patches/use-system-libminiupnpc-and-libnatpmp.patch (+42/-33)
To merge this branch: bzr merge lp:~jbicha/ubuntu/oneiric/transmission/transmission-2.33
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+70233@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2011-07-29 08:49:40 +0000
+++ debian/changelog 2011-08-02 23:39:25 +0000
@@ -1,3 +1,10 @@
1transmission (2.33-0ubuntu2) oneiric; urgency=low
2
3 * debian/patches/use-system-libminiupnpc-and-libnatpmp.patch
4 - Updated for libnatpmp ABI change
5
6 -- Jeremy Bicha <jbicha@ubuntu.com> Tue, 02 Aug 2011 12:30:36 -0400
7
1transmission (2.33-0ubuntu1) oneiric; urgency=low8transmission (2.33-0ubuntu1) oneiric; urgency=low
29
3 * New upstream release:10 * New upstream release:
411
=== modified file 'debian/patches/use-system-libminiupnpc-and-libnatpmp.patch'
--- debian/patches/use-system-libminiupnpc-and-libnatpmp.patch 2011-07-29 08:49:40 +0000
+++ debian/patches/use-system-libminiupnpc-and-libnatpmp.patch 2011-08-02 23:39:25 +0000
@@ -6,10 +6,10 @@
66
7Forwarded: no7Forwarded: no
88
9Index: oneiric/configure.ac9Index: oneiric2/configure.ac
10===================================================================10===================================================================
11--- oneiric.orig/configure.ac 2011-07-23 00:00:54.140979283 -040011--- oneiric2.orig/configure.ac 2011-08-02 12:14:40.310336786 -0400
12+++ oneiric/configure.ac 2011-07-29 04:35:00.568534098 -040012+++ oneiric2/configure.ac 2011-08-02 12:31:41.815326281 -0400
13@@ -18,7 +18,7 @@13@@ -18,7 +18,7 @@
14 14
15 dnl AM_CONFIG_HEADER(config.h)15 dnl AM_CONFIG_HEADER(config.h)
@@ -49,10 +49,10 @@
49 third-party/libutp/Makefile49 third-party/libutp/Makefile
50 third-party/dht/Makefile50 third-party/dht/Makefile
51 macosx/Makefile51 macosx/Makefile
52Index: oneiric/libtransmission/Makefile.am52Index: oneiric2/libtransmission/Makefile.am
53===================================================================53===================================================================
54--- oneiric.orig/libtransmission/Makefile.am 2011-07-23 00:00:54.190979522 -040054--- oneiric2.orig/libtransmission/Makefile.am 2011-08-02 12:14:40.340337522 -0400
55+++ oneiric/libtransmission/Makefile.am 2011-07-29 04:35:00.568534098 -040055+++ oneiric2/libtransmission/Makefile.am 2011-08-02 12:31:41.815326281 -0400
56@@ -1,7 +1,5 @@56@@ -1,7 +1,5 @@
57 AM_CPPFLAGS = \57 AM_CPPFLAGS = \
58- -I. \58- -I. \
@@ -81,10 +81,10 @@
81 @INTLLIBS@ \81 @INTLLIBS@ \
82 @DHT_LIBS@ \82 @DHT_LIBS@ \
83 @LIBUTP_LIBS@ \83 @LIBUTP_LIBS@ \
84Index: oneiric/third-party/Makefile.am84Index: oneiric2/third-party/Makefile.am
85===================================================================85===================================================================
86--- oneiric.orig/third-party/Makefile.am 2011-07-23 00:00:54.120979197 -040086--- oneiric2.orig/third-party/Makefile.am 2011-08-02 12:14:40.300336538 -0400
87+++ oneiric/third-party/Makefile.am 2011-07-29 04:35:00.568534098 -040087+++ oneiric2/third-party/Makefile.am 2011-08-02 12:31:41.825326521 -0400
88@@ -4,8 +4,6 @@88@@ -4,8 +4,6 @@
89 89
90 SUBDIRS = \90 SUBDIRS = \
@@ -94,10 +94,10 @@
94 $(UTP_DIR)94 $(UTP_DIR)
95 95
96 EXTRA_DIST = \96 EXTRA_DIST = \
97Index: oneiric/utils/Makefile.am97Index: oneiric2/utils/Makefile.am
98===================================================================98===================================================================
99--- oneiric.orig/utils/Makefile.am 2011-07-23 00:00:54.280979946 -040099--- oneiric2.orig/utils/Makefile.am 2011-08-02 12:14:40.400338984 -0400
100+++ oneiric/utils/Makefile.am 2011-07-29 04:35:00.568534098 -0400100+++ oneiric2/utils/Makefile.am 2011-08-02 12:31:41.845327014 -0400
101@@ -26,8 +26,8 @@101@@ -26,8 +26,8 @@
102 102
103 transmission_create_LDADD = \103 transmission_create_LDADD = \
@@ -109,10 +109,10 @@
109 @INTLLIBS@ \109 @INTLLIBS@ \
110 @DHT_LIBS@ \110 @DHT_LIBS@ \
111 @LIBUTP_LIBS@ \111 @LIBUTP_LIBS@ \
112Index: oneiric/daemon/Makefile.am112Index: oneiric2/daemon/Makefile.am
113===================================================================113===================================================================
114--- oneiric.orig/daemon/Makefile.am 2011-07-23 00:00:54.300980033 -0400114--- oneiric2.orig/daemon/Makefile.am 2011-08-02 12:14:40.430339717 -0400
115+++ oneiric/daemon/Makefile.am 2011-07-29 04:35:00.568534098 -0400115+++ oneiric2/daemon/Makefile.am 2011-08-02 12:31:41.845327014 -0400
116@@ -20,8 +20,8 @@116@@ -20,8 +20,8 @@
117 117
118 LDADD = \118 LDADD = \
@@ -124,10 +124,10 @@
124 @DHT_LIBS@ \124 @DHT_LIBS@ \
125 @LIBUTP_LIBS@ \125 @LIBUTP_LIBS@ \
126 @LIBEVENT_LIBS@ \126 @LIBEVENT_LIBS@ \
127Index: oneiric/qt/qtr.pro127Index: oneiric2/qt/qtr.pro
128===================================================================128===================================================================
129--- oneiric.orig/qt/qtr.pro 2011-07-23 00:00:54.090979054 -0400129--- oneiric2.orig/qt/qtr.pro 2011-08-02 12:14:40.270335801 -0400
130+++ oneiric/qt/qtr.pro 2011-07-29 04:35:00.568534098 -0400130+++ oneiric2/qt/qtr.pro 2011-08-02 12:31:41.845327014 -0400
131@@ -19,12 +19,9 @@131@@ -19,12 +19,9 @@
132 INCLUDEPATH = $${EVENT_TOP}/include $${INCLUDEPATH}132 INCLUDEPATH = $${EVENT_TOP}/include $${INCLUDEPATH}
133 INCLUDEPATH += $${TRANSMISSION_TOP}133 INCLUDEPATH += $${TRANSMISSION_TOP}
@@ -143,10 +143,10 @@
143 unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt143 unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt
144 win32:DEFINES += QT_DBUS144 win32:DEFINES += QT_DBUS
145 win32:LIBS += -levent-2.0 -lws2_32 -lintl145 win32:LIBS += -levent-2.0 -lws2_32 -lintl
146Index: oneiric/cli/Makefile.am146Index: oneiric2/cli/Makefile.am
147===================================================================147===================================================================
148--- oneiric.orig/cli/Makefile.am 2011-07-23 00:00:54.320980124 -0400148--- oneiric2.orig/cli/Makefile.am 2011-08-02 12:14:40.460340452 -0400
149+++ oneiric/cli/Makefile.am 2011-07-29 04:35:00.568534098 -0400149+++ oneiric2/cli/Makefile.am 2011-08-02 12:31:41.855327251 -0400
150@@ -18,8 +18,8 @@150@@ -18,8 +18,8 @@
151 151
152 transmission_cli_LDADD = \152 transmission_cli_LDADD = \
@@ -158,10 +158,10 @@
158 @DHT_LIBS@ \158 @DHT_LIBS@ \
159 @LIBUTP_LIBS@ \159 @LIBUTP_LIBS@ \
160 @LIBEVENT_LIBS@ \160 @LIBEVENT_LIBS@ \
161Index: oneiric/libtransmission/upnp.c161Index: oneiric2/libtransmission/upnp.c
162===================================================================162===================================================================
163--- oneiric.orig/libtransmission/upnp.c 2011-07-23 00:00:54.210979615 -0400163--- oneiric2.orig/libtransmission/upnp.c 2011-08-02 12:14:40.360337999 -0400
164+++ oneiric/libtransmission/upnp.c 2011-07-29 04:35:00.568534098 -0400164+++ oneiric2/libtransmission/upnp.c 2011-08-02 12:31:41.855327251 -0400
165@@ -13,8 +13,8 @@165@@ -13,8 +13,8 @@
166 #include <assert.h>166 #include <assert.h>
167 #include <errno.h>167 #include <errno.h>
@@ -173,10 +173,10 @@
173 173
174 #include "transmission.h"174 #include "transmission.h"
175 #include "port-forwarding.h"175 #include "port-forwarding.h"
176Index: oneiric/libtransmission/natpmp.c176Index: oneiric2/libtransmission/natpmp.c
177===================================================================177===================================================================
178--- oneiric.orig/libtransmission/natpmp.c 2011-07-23 00:00:54.250979800 -0400178--- oneiric2.orig/libtransmission/natpmp.c 2011-08-02 12:14:40.370338245 -0400
179+++ oneiric/libtransmission/natpmp.c 2011-07-29 04:35:00.568534098 -0400179+++ oneiric2/libtransmission/natpmp.c 2011-08-02 12:32:24.256307591 -0400
180@@ -17,7 +17,7 @@180@@ -17,7 +17,7 @@
181 #include <event2/util.h> /* evutil_inet_ntop() */181 #include <event2/util.h> /* evutil_inet_ntop() */
182 182
@@ -186,20 +186,29 @@
186 186
187 #include "transmission.h"187 #include "transmission.h"
188 #include "natpmp.h"188 #include "natpmp.h"
189Index: oneiric/third-party/libutp/utp.cpp189@@ -120,7 +120,7 @@
190
191 if( is_enabled && ( nat->state == TR_NATPMP_DISCOVER ) )
192 {
193- int val = initnatpmp( &nat->natpmp );
194+ int val = initnatpmp( &nat->natpmp, 0, 0 );
195 logVal( "initnatpmp", val );
196 val = sendpublicaddressrequest( &nat->natpmp );
197 logVal( "sendpublicaddressrequest", val );
198Index: oneiric2/third-party/libutp/utp.cpp
190===================================================================199===================================================================
191--- oneiric.orig/third-party/libutp/utp.cpp 2011-07-23 00:00:54.110979144 -0400200--- oneiric2.orig/third-party/libutp/utp.cpp 2011-08-02 12:14:40.280336051 -0400
192+++ oneiric/third-party/libutp/utp.cpp 2011-07-29 04:35:00.568534098 -0400201+++ oneiric2/third-party/libutp/utp.cpp 2011-08-02 12:31:41.855327251 -0400
193@@ -1,4 +1,4 @@202@@ -1,4 +1,4 @@
194-#include <StdAfx.h>203-#include <StdAfx.h>
195+#include "StdAfx.h"204+#include "StdAfx.h"
196 205
197 #include "utp.h"206 #include "utp.h"
198 #include "templates.h"207 #include "templates.h"
199Index: oneiric/gtk/Makefile.am208Index: oneiric2/gtk/Makefile.am
200===================================================================209===================================================================
201--- oneiric.orig/gtk/Makefile.am 2011-07-29 04:35:16.748867838 -0400210--- oneiric2.orig/gtk/Makefile.am 2011-08-02 12:14:40.330337269 -0400
202+++ oneiric/gtk/Makefile.am 2011-07-29 04:36:05.449873842 -0400211+++ oneiric2/gtk/Makefile.am 2011-08-02 12:31:41.855327251 -0400
203@@ -92,8 +92,8 @@212@@ -92,8 +92,8 @@
204 213
205 transmission_gtk_LDADD = \214 transmission_gtk_LDADD = \

Subscribers

People subscribed via source and target branches