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
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-07-29 08:49:40 +0000
3+++ debian/changelog 2011-08-02 23:39:25 +0000
4@@ -1,3 +1,10 @@
5+transmission (2.33-0ubuntu2) oneiric; urgency=low
6+
7+ * debian/patches/use-system-libminiupnpc-and-libnatpmp.patch
8+ - Updated for libnatpmp ABI change
9+
10+ -- Jeremy Bicha <jbicha@ubuntu.com> Tue, 02 Aug 2011 12:30:36 -0400
11+
12 transmission (2.33-0ubuntu1) oneiric; urgency=low
13
14 * New upstream release:
15
16=== modified file 'debian/patches/use-system-libminiupnpc-and-libnatpmp.patch'
17--- debian/patches/use-system-libminiupnpc-and-libnatpmp.patch 2011-07-29 08:49:40 +0000
18+++ debian/patches/use-system-libminiupnpc-and-libnatpmp.patch 2011-08-02 23:39:25 +0000
19@@ -6,10 +6,10 @@
20
21 Forwarded: no
22
23-Index: oneiric/configure.ac
24+Index: oneiric2/configure.ac
25 ===================================================================
26---- oneiric.orig/configure.ac 2011-07-23 00:00:54.140979283 -0400
27-+++ oneiric/configure.ac 2011-07-29 04:35:00.568534098 -0400
28+--- oneiric2.orig/configure.ac 2011-08-02 12:14:40.310336786 -0400
29++++ oneiric2/configure.ac 2011-08-02 12:31:41.815326281 -0400
30 @@ -18,7 +18,7 @@
31
32 dnl AM_CONFIG_HEADER(config.h)
33@@ -49,10 +49,10 @@
34 third-party/libutp/Makefile
35 third-party/dht/Makefile
36 macosx/Makefile
37-Index: oneiric/libtransmission/Makefile.am
38+Index: oneiric2/libtransmission/Makefile.am
39 ===================================================================
40---- oneiric.orig/libtransmission/Makefile.am 2011-07-23 00:00:54.190979522 -0400
41-+++ oneiric/libtransmission/Makefile.am 2011-07-29 04:35:00.568534098 -0400
42+--- oneiric2.orig/libtransmission/Makefile.am 2011-08-02 12:14:40.340337522 -0400
43++++ oneiric2/libtransmission/Makefile.am 2011-08-02 12:31:41.815326281 -0400
44 @@ -1,7 +1,5 @@
45 AM_CPPFLAGS = \
46 - -I. \
47@@ -81,10 +81,10 @@
48 @INTLLIBS@ \
49 @DHT_LIBS@ \
50 @LIBUTP_LIBS@ \
51-Index: oneiric/third-party/Makefile.am
52+Index: oneiric2/third-party/Makefile.am
53 ===================================================================
54---- oneiric.orig/third-party/Makefile.am 2011-07-23 00:00:54.120979197 -0400
55-+++ oneiric/third-party/Makefile.am 2011-07-29 04:35:00.568534098 -0400
56+--- oneiric2.orig/third-party/Makefile.am 2011-08-02 12:14:40.300336538 -0400
57++++ oneiric2/third-party/Makefile.am 2011-08-02 12:31:41.825326521 -0400
58 @@ -4,8 +4,6 @@
59
60 SUBDIRS = \
61@@ -94,10 +94,10 @@
62 $(UTP_DIR)
63
64 EXTRA_DIST = \
65-Index: oneiric/utils/Makefile.am
66+Index: oneiric2/utils/Makefile.am
67 ===================================================================
68---- oneiric.orig/utils/Makefile.am 2011-07-23 00:00:54.280979946 -0400
69-+++ oneiric/utils/Makefile.am 2011-07-29 04:35:00.568534098 -0400
70+--- oneiric2.orig/utils/Makefile.am 2011-08-02 12:14:40.400338984 -0400
71++++ oneiric2/utils/Makefile.am 2011-08-02 12:31:41.845327014 -0400
72 @@ -26,8 +26,8 @@
73
74 transmission_create_LDADD = \
75@@ -109,10 +109,10 @@
76 @INTLLIBS@ \
77 @DHT_LIBS@ \
78 @LIBUTP_LIBS@ \
79-Index: oneiric/daemon/Makefile.am
80+Index: oneiric2/daemon/Makefile.am
81 ===================================================================
82---- oneiric.orig/daemon/Makefile.am 2011-07-23 00:00:54.300980033 -0400
83-+++ oneiric/daemon/Makefile.am 2011-07-29 04:35:00.568534098 -0400
84+--- oneiric2.orig/daemon/Makefile.am 2011-08-02 12:14:40.430339717 -0400
85++++ oneiric2/daemon/Makefile.am 2011-08-02 12:31:41.845327014 -0400
86 @@ -20,8 +20,8 @@
87
88 LDADD = \
89@@ -124,10 +124,10 @@
90 @DHT_LIBS@ \
91 @LIBUTP_LIBS@ \
92 @LIBEVENT_LIBS@ \
93-Index: oneiric/qt/qtr.pro
94+Index: oneiric2/qt/qtr.pro
95 ===================================================================
96---- oneiric.orig/qt/qtr.pro 2011-07-23 00:00:54.090979054 -0400
97-+++ oneiric/qt/qtr.pro 2011-07-29 04:35:00.568534098 -0400
98+--- oneiric2.orig/qt/qtr.pro 2011-08-02 12:14:40.270335801 -0400
99++++ oneiric2/qt/qtr.pro 2011-08-02 12:31:41.845327014 -0400
100 @@ -19,12 +19,9 @@
101 INCLUDEPATH = $${EVENT_TOP}/include $${INCLUDEPATH}
102 INCLUDEPATH += $${TRANSMISSION_TOP}
103@@ -143,10 +143,10 @@
104 unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt
105 win32:DEFINES += QT_DBUS
106 win32:LIBS += -levent-2.0 -lws2_32 -lintl
107-Index: oneiric/cli/Makefile.am
108+Index: oneiric2/cli/Makefile.am
109 ===================================================================
110---- oneiric.orig/cli/Makefile.am 2011-07-23 00:00:54.320980124 -0400
111-+++ oneiric/cli/Makefile.am 2011-07-29 04:35:00.568534098 -0400
112+--- oneiric2.orig/cli/Makefile.am 2011-08-02 12:14:40.460340452 -0400
113++++ oneiric2/cli/Makefile.am 2011-08-02 12:31:41.855327251 -0400
114 @@ -18,8 +18,8 @@
115
116 transmission_cli_LDADD = \
117@@ -158,10 +158,10 @@
118 @DHT_LIBS@ \
119 @LIBUTP_LIBS@ \
120 @LIBEVENT_LIBS@ \
121-Index: oneiric/libtransmission/upnp.c
122+Index: oneiric2/libtransmission/upnp.c
123 ===================================================================
124---- oneiric.orig/libtransmission/upnp.c 2011-07-23 00:00:54.210979615 -0400
125-+++ oneiric/libtransmission/upnp.c 2011-07-29 04:35:00.568534098 -0400
126+--- oneiric2.orig/libtransmission/upnp.c 2011-08-02 12:14:40.360337999 -0400
127++++ oneiric2/libtransmission/upnp.c 2011-08-02 12:31:41.855327251 -0400
128 @@ -13,8 +13,8 @@
129 #include <assert.h>
130 #include <errno.h>
131@@ -173,10 +173,10 @@
132
133 #include "transmission.h"
134 #include "port-forwarding.h"
135-Index: oneiric/libtransmission/natpmp.c
136+Index: oneiric2/libtransmission/natpmp.c
137 ===================================================================
138---- oneiric.orig/libtransmission/natpmp.c 2011-07-23 00:00:54.250979800 -0400
139-+++ oneiric/libtransmission/natpmp.c 2011-07-29 04:35:00.568534098 -0400
140+--- oneiric2.orig/libtransmission/natpmp.c 2011-08-02 12:14:40.370338245 -0400
141++++ oneiric2/libtransmission/natpmp.c 2011-08-02 12:32:24.256307591 -0400
142 @@ -17,7 +17,7 @@
143 #include <event2/util.h> /* evutil_inet_ntop() */
144
145@@ -186,20 +186,29 @@
146
147 #include "transmission.h"
148 #include "natpmp.h"
149-Index: oneiric/third-party/libutp/utp.cpp
150+@@ -120,7 +120,7 @@
151+
152+ if( is_enabled && ( nat->state == TR_NATPMP_DISCOVER ) )
153+ {
154+- int val = initnatpmp( &nat->natpmp );
155++ int val = initnatpmp( &nat->natpmp, 0, 0 );
156+ logVal( "initnatpmp", val );
157+ val = sendpublicaddressrequest( &nat->natpmp );
158+ logVal( "sendpublicaddressrequest", val );
159+Index: oneiric2/third-party/libutp/utp.cpp
160 ===================================================================
161---- oneiric.orig/third-party/libutp/utp.cpp 2011-07-23 00:00:54.110979144 -0400
162-+++ oneiric/third-party/libutp/utp.cpp 2011-07-29 04:35:00.568534098 -0400
163+--- oneiric2.orig/third-party/libutp/utp.cpp 2011-08-02 12:14:40.280336051 -0400
164++++ oneiric2/third-party/libutp/utp.cpp 2011-08-02 12:31:41.855327251 -0400
165 @@ -1,4 +1,4 @@
166 -#include <StdAfx.h>
167 +#include "StdAfx.h"
168
169 #include "utp.h"
170 #include "templates.h"
171-Index: oneiric/gtk/Makefile.am
172+Index: oneiric2/gtk/Makefile.am
173 ===================================================================
174---- oneiric.orig/gtk/Makefile.am 2011-07-29 04:35:16.748867838 -0400
175-+++ oneiric/gtk/Makefile.am 2011-07-29 04:36:05.449873842 -0400
176+--- oneiric2.orig/gtk/Makefile.am 2011-08-02 12:14:40.330337269 -0400
177++++ oneiric2/gtk/Makefile.am 2011-08-02 12:31:41.855327251 -0400
178 @@ -92,8 +92,8 @@
179
180 transmission_gtk_LDADD = \

Subscribers

People subscribed via source and target branches