Control: tags -1 + pending Dear maintainer,
I've prepared an NMU for warzone2100 (versioned as 3.1~beta11-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- Sebastian Ramacher
diff -Nru warzone2100-3.1~beta11/debian/changelog warzone2100-3.1~beta11/debian/changelog
--- warzone2100-3.1~beta11/debian/changelog 2012-06-21 05:09:42.000000000 +0200
+++ warzone2100-3.1~beta11/debian/changelog 2014-01-15 22:18:50.000000000 +0100
@@ -1,3 +1,13 @@
+warzone2100 (3.1~beta11-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches/miniupnpc8-compat.patch: Apply patch from James Page
+ to fix compilation against miniupnpc 1.6. (Closes: #651309)
+ * debian/control: Bump B-D on libminiupnpc-dev to >= 1.6 since the patch
+ makes it incompatible with older versions.
+
+ -- Sebastian Ramacher <sramac...@debian.org> Wed, 15 Jan 2014 22:18:01 +0100
+
warzone2100 (3.1~beta11-2) unstable; urgency=low
* Fix FTBFS on non-x86 platforms using upstream patch
diff -Nru warzone2100-3.1~beta11/debian/control warzone2100-3.1~beta11/debian/control
--- warzone2100-3.1~beta11/debian/control 2012-06-20 12:42:09.000000000 +0200
+++ warzone2100-3.1~beta11/debian/control 2014-01-15 22:08:08.000000000 +0100
@@ -21,7 +21,7 @@
libfribidi-dev,
libglc-dev,
libglew-dev,
- libminiupnpc-dev,
+ libminiupnpc-dev (>= 1.6),
libopenal-dev,
libphysfs-dev,
libpng-dev,
diff -Nru warzone2100-3.1~beta11/debian/patches/miniupnpc8-compat.patch warzone2100-3.1~beta11/debian/patches/miniupnpc8-compat.patch
--- warzone2100-3.1~beta11/debian/patches/miniupnpc8-compat.patch 1970-01-01 01:00:00.000000000 +0100
+++ warzone2100-3.1~beta11/debian/patches/miniupnpc8-compat.patch 2014-01-15 22:12:06.000000000 +0100
@@ -0,0 +1,24 @@
+Description: Compatibility patch for miniupnpc 1.6
+Author: James Page <james.p...@ubuntu.com>
+Forwarded: no
+
+--- a/lib/netplay/netplay.cpp
++++ b/lib/netplay/netplay.cpp
+@@ -926,7 +926,7 @@
+ if (NetPlay.isUPNP)
+ {
+ debug(LOG_NET, "Searching for UPnP devices for automatic port forwarding...");
+- devlist = upnpDiscover(2000, NULL, NULL, 0);
++ devlist = upnpDiscover(2000, NULL, NULL, 0, 0, NULL);
+ debug(LOG_NET, "UPnP device search finished.");
+ if (devlist)
+ {
+@@ -988,7 +988,7 @@
+ UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIP);
+ sprintf(port_str, "%d", port);
+ r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,
+- port_str, port_str, lanaddr, "Warzone 2100", "TCP", 0);
++ port_str, port_str, lanaddr, "Warzone 2100", "TCP", 0, 0);
+ if (r != UPNPCOMMAND_SUCCESS)
+ {
+ debug(LOG_NET, "AddPortMapping(%s, %s, %s) failed\n", port_str, port_str, lanaddr);
diff -Nru warzone2100-3.1~beta11/debian/patches/series warzone2100-3.1~beta11/debian/patches/series
--- warzone2100-3.1~beta11/debian/patches/series 2012-06-21 05:04:48.000000000 +0200
+++ warzone2100-3.1~beta11/debian/patches/series 2014-01-15 22:12:36.000000000 +0100
@@ -1,2 +1,3 @@
use-system-libraries.patch
fix-FTBFS-on-non-x86-platforms.patch
+miniupnpc8-compat.patch
signature.asc
Description: Digital signature
