r12387 - in packages/trunk/warzone2100/debian: . patches

[Paul Wise]

Author: pabs
Date: 2011-05-17 02:15:24 +0000 (Tue, 17 May 2011)
New Revision: 12387

Modified:
   packages/trunk/warzone2100/debian/changelog
   packages/trunk/warzone2100/debian/patches/0001-Switch-to-using-external-miniupnpc.patch
Log:
Refresh miniupnpc removal patch

Modified: packages/trunk/warzone2100/debian/changelog
===================================================================
--- packages/trunk/warzone2100/debian/changelog	2011-05-17 02:07:28 UTC (rev 12386)
+++ packages/trunk/warzone2100/debian/changelog	2011-05-17 02:15:24 UTC (rev 12387)
@@ -1,6 +1,7 @@
 warzone2100 (2.3.8-1) UNRELEASED; urgency=low
 
   * New upstream release
+    - Refresh miniupnpc removal patch
 
  -- Paul Wise <pabs at debian.org>  Tue, 17 May 2011 10:02:50 +0800
 

Modified: packages/trunk/warzone2100/debian/patches/0001-Switch-to-using-external-miniupnpc.patch
===================================================================
--- packages/trunk/warzone2100/debian/patches/0001-Switch-to-using-external-miniupnpc.patch	2011-05-17 02:07:28 UTC (rev 12386)
+++ packages/trunk/warzone2100/debian/patches/0001-Switch-to-using-external-miniupnpc.patch	2011-05-17 02:15:24 UTC (rev 12387)
@@ -3,7 +3,7 @@
 Subject: Switch to using external miniupnpc
 --- a/configure.ac
 +++ b/configure.ac
-@@ -408,6 +408,10 @@ AS_IF([test "$enable_motif" != "no"],[
+@@ -413,6 +413,10 @@
  ])
  AM_CONDITIONAL([MOTIF_AVAILABLE], test -n "$MOTIF_LIBS")
  
@@ -14,7 +14,7 @@
  # Look for Popt
  AC_CHECK_HEADER(popt.h, , AC_MSG_ERROR([Popt header not found.]))
  AC_CHECK_LIB(popt, poptGetContext, AC_SUBST([POPT_LIBS], [-lpopt]), AC_MSG_ERROR([Popt not found.]), [${WIN32_LIBS}])
-@@ -493,7 +497,6 @@ AC_CONFIG_FILES([Makefile
+@@ -498,7 +502,6 @@
  		lib/ivis_opengl/Makefile
  		lib/ivis_common/Makefile
  		lib/netplay/Makefile
@@ -30,15 +30,6 @@
  AM_CPPFLAGS = $(SDL_CFLAGS) $(SDL_NET_CFLAGS) $(WZ_CPPFLAGS)
  AM_CFLAGS = $(WZ_CFLAGS)
  AM_CXXFLAGS = $(WZ_CXXFLAGS)
-@@ -16,7 +14,7 @@ libnetplay_a_SOURCES = \
- 	netplay.c \
- 	nettypes.c
- 
--libnetplay_a_LIBADD = $(top_builddir)/lib/framework/libframework.a $(top_builddir)/lib/netplay/miniupnpc/libminiupnpc.a
-+libnetplay_a_LIBADD = $(top_builddir)/lib/framework/libframework.a
- 
- # HACK Don't give make errors when switching between trunk and branches.
- # Works by finding the .deps/*.Po files which refer to source files that don't exist, and replacing them with a single dependency on the correct source file.
 --- a/lib/netplay/netplay.c
 +++ b/lib/netplay/netplay.c
 @@ -37,9 +37,9 @@
@@ -54,7 +45,7 @@
  #include "lib/exceptionhandler/dumpinfo.h"
  
  #include "src/multistat.h"
-@@ -2126,9 +2126,9 @@ static bool upnp_add_redirect(int port)
+@@ -2126,9 +2126,9 @@
  	int r;
  
  	debug(LOG_NET, "upnp_add_redir(%d)\n", port);
@@ -66,7 +57,7 @@
  			port_str, port_str, lanaddr, "Warzone 2100", "TCP", 0);
  	if (r != UPNPCOMMAND_SUCCESS)
  	{
-@@ -2144,7 +2144,7 @@ static void upnp_rem_redirect(int port)
+@@ -2144,7 +2144,7 @@
  	char port_str[16];
  	debug(LOG_NET, "upnp_rem_redir(%d)", port);
  	sprintf(port_str, "%d", port);
@@ -77,7 +68,7 @@
  void NETaddRedirects(void)
 --- a/po/update-po.sh
 +++ b/po/update-po.sh
-@@ -11,5 +11,5 @@ EOF
+@@ -11,5 +11,5 @@
  find lib src data -type f |
  	grep -v '\/.svn\/' |
  	grep -e '\.c\(pp\|xx\)\?$' -e 'data.*strings.*\.txt$' -e 'data.*sequenceaudio.*\.tx.$' -e '\.slo$' -e '\.rmsg$' |
@@ -95,7 +86,7 @@
  AM_CFLAGS = $(WZ_CFLAGS)
  AM_CXXFLAGS = $(WZ_CXXFLAGS)
  AM_LFLAGS = $(FLEX_FLAGS)
-@@ -290,7 +290,6 @@ warzone2100_LDADD = \
+@@ -290,7 +290,6 @@
  	$(top_builddir)/lib/sound/libsound.a \
  	$(top_builddir)/lib/script/libscript.a \
  	$(top_builddir)/lib/netplay/libnetplay.a \
@@ -103,7 +94,7 @@
  	$(top_builddir)/lib/ivis_opengl/libivis_opengl.a \
  	$(top_builddir)/lib/ivis_common/libivis_common.a \
  	$(top_builddir)/lib/gamelib/libgamelib.a \
-@@ -298,7 +297,7 @@ warzone2100_LDADD = \
+@@ -298,7 +297,7 @@
  	$(top_builddir)/lib/iniparser/libiniparser.a \
  	$(top_builddir)/lib/exceptionhandler/libexceptionhandler.a