r16087 - in packages/trunk/warzone2100/debian: . patches
Markus Koschany
apo at moszumanska.debian.org
Sat Feb 24 00:20:52 UTC 2018
Author: apo
Date: 2018-02-24 00:20:52 +0000 (Sat, 24 Feb 2018)
New Revision: 16087
Added:
packages/trunk/warzone2100/debian/patches/miniupnpc-api.patch
Removed:
packages/trunk/warzone2100/debian/menu
packages/trunk/warzone2100/debian/patches/fix-upnpDiscover.patch
Modified:
packages/trunk/warzone2100/debian/changelog
packages/trunk/warzone2100/debian/clean
packages/trunk/warzone2100/debian/compat
packages/trunk/warzone2100/debian/control
packages/trunk/warzone2100/debian/copyright
packages/trunk/warzone2100/debian/patches/series
packages/trunk/warzone2100/debian/rules
packages/trunk/warzone2100/debian/warzone2100.install
Log:
Release 3.2.1-3
Modified: packages/trunk/warzone2100/debian/changelog
===================================================================
--- packages/trunk/warzone2100/debian/changelog 2018-02-17 23:28:14 UTC (rev 16086)
+++ packages/trunk/warzone2100/debian/changelog 2018-02-24 00:20:52 UTC (rev 16087)
@@ -1,8 +1,13 @@
-warzone2100 (3.2.1-3) UNRELEASED; urgency=medium
+warzone2100 (3.2.1-3) unstable; urgency=medium
- * Remove myself from uploaders
+ * Team upload.
+ * Use compat level 11.
+ * Declare compliance with Debian Policy 4.1.3.
+ * Drop obsolete menu file and xpm icons. Remove imagemagick from B-D.
+ * Fix build with miniupnpc API 16.
+ Thanks to Peter Michael Green for the patch. (Closes: #889059)
- -- Christoph Egger <christoph at debian.org> Tue, 31 Oct 2017 13:11:40 +0100
+ -- Markus Koschany <apo at debian.org> Sat, 24 Feb 2018 00:51:59 +0100
warzone2100 (3.2.1-2) unstable; urgency=medium
@@ -184,7 +189,7 @@
* New upstream bugfix release
- Fixes issues in 2.3.2 (Closes: #591215)
- - Upstream community renamed, update copyright information
+ - Upstream community renamed, update copyright information
-- Paul Wise <pabs at debian.org> Thu, 05 Aug 2010 21:08:56 -0400
@@ -272,7 +277,7 @@
warzone2100 (2.2.2+dfsg1-1) unstable; urgency=low
* New upstream release
- * Bump Standards-Version, no changes needed
+ * Bump Standards-Version, no changes needed
-- Paul Wise <pabs at debian.org> Mon, 24 Aug 2009 23:32:48 +0800
Modified: packages/trunk/warzone2100/debian/clean
===================================================================
--- packages/trunk/warzone2100/debian/clean 2018-02-17 23:28:14 UTC (rev 16086)
+++ packages/trunk/warzone2100/debian/clean 2018-02-24 00:20:52 UTC (rev 16087)
@@ -19,6 +19,4 @@
lib/framework/strres_lexer.cpp
lib/framework/strres_parser.cpp
lib/framework/strres_parser.h
-warzone2100-16x16.xpm
-warzone2100-32x32.xpm
po/custom/fromJson.txt
Modified: packages/trunk/warzone2100/debian/compat
===================================================================
--- packages/trunk/warzone2100/debian/compat 2018-02-17 23:28:14 UTC (rev 16086)
+++ packages/trunk/warzone2100/debian/compat 2018-02-24 00:20:52 UTC (rev 16087)
@@ -1 +1 @@
-10
+11
Modified: packages/trunk/warzone2100/debian/control
===================================================================
--- packages/trunk/warzone2100/debian/control 2018-02-17 23:28:14 UTC (rev 16086)
+++ packages/trunk/warzone2100/debian/control 2018-02-24 00:20:52 UTC (rev 16087)
@@ -3,20 +3,18 @@
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders:
- Paul Wise <pabs at debian.org>
+ Paul Wise <pabs at debian.org>,
+ Christoph Egger <christoph at debian.org>
Build-Depends:
asciidoc,
automake1.11,
- autotools-dev,
bison,
- debhelper (>= 10),
- dh-autoreconf,
+ debhelper (>= 11),
docbook-xml,
docbook-xsl,
flex (>= 2.5.33~),
flex (>= 2.5.35~) | flex (<< 2.5.34~),
icoutils,
- imagemagick,
libfontconfig-dev,
libfreetype6-dev,
libfribidi-dev,
@@ -41,7 +39,7 @@
xsltproc,
xvfb,
zip
-Standards-Version: 3.9.8
+Standards-Version: 4.1.3
Homepage: http://www.wz2100.net/
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/warzone2100/
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/warzone2100/
Modified: packages/trunk/warzone2100/debian/copyright
===================================================================
--- packages/trunk/warzone2100/debian/copyright 2018-02-17 23:28:14 UTC (rev 16086)
+++ packages/trunk/warzone2100/debian/copyright 2018-02-24 00:20:52 UTC (rev 16087)
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Warzone 2100
Upstream-Contact: http://wz2100.net/contact
Source: http://wz2100.net/download
Deleted: packages/trunk/warzone2100/debian/menu
===================================================================
--- packages/trunk/warzone2100/debian/menu 2018-02-17 23:28:14 UTC (rev 16086)
+++ packages/trunk/warzone2100/debian/menu 2018-02-24 00:20:52 UTC (rev 16087)
@@ -1,9 +0,0 @@
-?package(warzone2100): \
- needs="x11" \
- section="Games/Strategy" \
- title="Warzone 2100" \
- longtitle="Postnuclear realtime strategy" \
- icon="/usr/share/pixmaps/warzone2100-16x16.xpm" \
- icon16x16="/usr/share/pixmaps/warzone2100-16x16.xpm" \
- icon32x32="/usr/share/pixmaps/warzone2100-32x32.xpm" \
- command="/usr/games/warzone2100"
Deleted: packages/trunk/warzone2100/debian/patches/fix-upnpDiscover.patch
===================================================================
--- packages/trunk/warzone2100/debian/patches/fix-upnpDiscover.patch 2018-02-17 23:28:14 UTC (rev 16086)
+++ packages/trunk/warzone2100/debian/patches/fix-upnpDiscover.patch 2018-02-24 00:20:52 UTC (rev 16087)
@@ -1,23 +0,0 @@
-From: Russell Coker <russell at coker.com.au>
-Date: Mon, 19 Sep 2016 23:24:25 +0200
-Subject: fix-upnpDiscover
-
-remove extra arg from upnpDiscover()
-Forwarded: no
----
- lib/netplay/netplay.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/netplay/netplay.cpp b/lib/netplay/netplay.cpp
-index 6c14dde..14266db 100644
---- a/lib/netplay/netplay.cpp
-+++ b/lib/netplay/netplay.cpp
-@@ -951,7 +951,7 @@ static int upnp_init(void *asdf)
- if (NetPlay.isUPNP)
- {
- debug(LOG_NET, "Searching for UPnP devices for automatic port forwarding...");
-- devlist = upnpDiscover(3000, NULL, NULL, 0, 0, 2, &result);
-+ devlist = upnpDiscover(3000, NULL, NULL, 0, 0, &result);
- debug(LOG_NET, "UPnP device search finished.");
- if (devlist)
- {
Added: packages/trunk/warzone2100/debian/patches/miniupnpc-api.patch
===================================================================
--- packages/trunk/warzone2100/debian/patches/miniupnpc-api.patch (rev 0)
+++ packages/trunk/warzone2100/debian/patches/miniupnpc-api.patch 2018-02-24 00:20:52 UTC (rev 16087)
@@ -0,0 +1,49 @@
+support both mininupnp API
+versions 14+ and the version previously used in Debian.
+
+Thanks to Thomas Bernard for pointing out what the problem with upnpDiscover
+was and providing the #if conditions to use.
+
+miniwget fix based on changes to testminiwget.c at
+https://github.com/miniupnp/miniupnp/commit/c4991916e5c12a7754e935e71a5313e75af6aeb9#diff-9813014a8c763f65cfbd4caec9552ddd
+
+This patch replaces fix-upnpDiscover.patch by Russel corker <russell at coker.com.au>
+which made the package build with the version of miniupnpc in Debian at the time
+but broke support for API version 14+
+
+Author: Peter Michael Green <plugwash at debian.org>
+Bug-debian: http://bugs.debian.org/889059
+
+Index: warzone2100-3.2.1/lib/netplay/netplay.cpp
+===================================================================
+--- warzone2100-3.2.1.orig/lib/netplay/netplay.cpp
++++ warzone2100-3.2.1/lib/netplay/netplay.cpp
+@@ -951,7 +951,11 @@ static int upnp_init(void *asdf)
+ if (NetPlay.isUPNP)
+ {
+ debug(LOG_NET, "Searching for UPnP devices for automatic port forwarding...");
++#if defined(MINIUPNPC_API_VERSION) && (MINIUPNPC_API_VERSION >= 14)
+ devlist = upnpDiscover(3000, NULL, NULL, 0, 0, 2, &result);
++#else
++ devlist = upnpDiscover(3000, NULL, NULL, 0, 0, &result);
++#endif
+ debug(LOG_NET, "UPnP device search finished.");
+ if (devlist)
+ {
+@@ -971,7 +975,16 @@ static int upnp_init(void *asdf)
+
+ debug(LOG_NET, "UPnP device found: %s %s\n", dev->descURL, dev->st);
+
++#if defined(MINIUPNPC_API_VERSION) && (MINIUPNPC_API_VERSION >= 16)
++ int status_code = -1;
++ descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, sizeof(lanaddr), dev->scope_id, &status_code);
++ if (descXML && (status_code != 200)) {
++ free(descXML);
++ descXML = NULL;
++ }
++#else
+ descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, sizeof(lanaddr), dev->scope_id);
++#endif
+ debug(LOG_NET, "LAN address: %s", lanaddr);
+ if (descXML)
+ {
Modified: packages/trunk/warzone2100/debian/patches/series
===================================================================
--- packages/trunk/warzone2100/debian/patches/series 2018-02-17 23:28:14 UTC (rev 16086)
+++ packages/trunk/warzone2100/debian/patches/series 2018-02-24 00:20:52 UTC (rev 16087)
@@ -3,8 +3,8 @@
revert-e397b24d4724d835d6cdc39a92800e64c0551dab.patch
fix-yacc.patch
redefinition-FTBFS.patch
-fix-upnpDiscover.patch
add-needed-const.patch
appdata.patch
quickstartguide.patch
openssl-1.1.patch
+miniupnpc-api.patch
Modified: packages/trunk/warzone2100/debian/rules
===================================================================
--- packages/trunk/warzone2100/debian/rules 2018-02-17 23:28:14 UTC (rev 16086)
+++ packages/trunk/warzone2100/debian/rules 2018-02-24 00:20:52 UTC (rev 16087)
@@ -56,8 +56,6 @@
# The default bit depth is too low for the images in the PDF
xvfb-run --auto-servernum --server-args="-screen 0 1024x768x24" dh_auto_build
icotool -x icons/warzone2100.ico
- convert warzone2100_*_16x16x32.png warzone2100-16x16.xpm
- convert warzone2100_*_32x32x32.png warzone2100-32x32.xpm
rm -f warzone2100_*_*x*x*.png
override_dh_auto_install:
Modified: packages/trunk/warzone2100/debian/warzone2100.install
===================================================================
--- packages/trunk/warzone2100/debian/warzone2100.install 2018-02-17 23:28:14 UTC (rev 16086)
+++ packages/trunk/warzone2100/debian/warzone2100.install 2018-02-24 00:20:52 UTC (rev 16087)
@@ -1,5 +1,3 @@
-../../warzone2100-16x16.xpm usr/share/pixmaps
-../../warzone2100-32x32.xpm usr/share/pixmaps
usr/games
usr/share/applications
usr/share/icons
More information about the Pkg-games-commits
mailing list