Author: tolimar Date: 2011-11-17 12:51:00 +0000 (Thu, 17 Nov 2011) New Revision: 12822
Removed: packages/trunk/supertuxkart/debian/patches/enet1.3.patch Modified: packages/trunk/supertuxkart/debian/changelog packages/trunk/supertuxkart/debian/patches/build-against-system-enet.patch packages/trunk/supertuxkart/debian/patches/series Log: Refresh patches Modified: packages/trunk/supertuxkart/debian/changelog =================================================================== --- packages/trunk/supertuxkart/debian/changelog 2011-11-17 12:26:56 UTC (rev 12821) +++ packages/trunk/supertuxkart/debian/changelog 2011-11-17 12:51:00 UTC (rev 12822) @@ -2,8 +2,10 @@ * New upstream release (Closes: #634019) * Fix watchfile to ignore release candidates + * Refresh patches/build-against-system-enet.patch + * Drop patches/enet1.3.patch (Applied upstream) - -- Alexander Reichle-Schmehl <[email protected]> Thu, 17 Nov 2011 13:26:22 +0100 + -- Alexander Reichle-Schmehl <[email protected]> Thu, 17 Nov 2011 13:49:57 +0100 supertuxkart (0.7+dfsg1-2) unstable; urgency=low Modified: packages/trunk/supertuxkart/debian/patches/build-against-system-enet.patch =================================================================== --- packages/trunk/supertuxkart/debian/patches/build-against-system-enet.patch 2011-11-17 12:26:56 UTC (rev 12821) +++ packages/trunk/supertuxkart/debian/patches/build-against-system-enet.patch 2011-11-17 12:51:00 UTC (rev 12822) @@ -1,20 +1,16 @@ -Index: supertuxkart-0.7+dfsg1/Makefile.am -=================================================================== ---- supertuxkart-0.7+dfsg1.orig/Makefile.am 2011-03-17 21:33:33.217430007 +0100 -+++ supertuxkart-0.7+dfsg1/Makefile.am 2011-03-17 21:38:27.493430007 +0100 +--- a/Makefile.am ++++ b/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 --SUBDIRS = $(BULLETTREE) $(ENETTREE) src doc data -+SUBDIRS = $(BULLETTREE) src doc data +-SUBDIRS = $(BULLETTREE) $(ENETTREE) src doc data tools ++SUBDIRS = $(BULLETTREE) src doc data tools pkgdatadir=$(datadir)/doc/$(PACKAGE) dist_pkgdata_DATA=AUTHORS ChangeLog COPYING README -Index: supertuxkart-0.7+dfsg1/src/Makefile.am -=================================================================== ---- supertuxkart-0.7+dfsg1.orig/src/Makefile.am 2011-03-17 21:33:33.205430007 +0100 -+++ supertuxkart-0.7+dfsg1/src/Makefile.am 2011-03-17 21:38:27.493430007 +0100 -@@ -6,7 +6,7 @@ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -6,7 +6,7 @@ bindir=$(prefix)/games bin_PROGRAMS = supertuxkart AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/games/$(PACKAGE)/\"" \ @@ -23,7 +19,7 @@ supertuxkart_SOURCES = \ main.cpp \ -@@ -395,7 +395,7 @@ +@@ -475,6 +475,6 @@ supertuxkart_SOURCES = \ # Link in the specific gcc 4.1 bug work around supertuxkart_LDADD = \ @@ -31,16 +27,13 @@ + $(irrlicht_LIBS) $(fribidi_LIBS) $(bullet_LIBS) -lenet \ $(opengl_LIBS) $(openal_LIBS) $(oggvorbis_LIBS) \ $(INTLLIBS) $(LIBCURL_LIBS) $(LIBCURL_CFLAGS) - -Index: supertuxkart-0.7+dfsg1/configure.ac -=================================================================== ---- supertuxkart-0.7+dfsg1.orig/configure.ac 2011-03-17 21:38:37.269430007 +0100 -+++ supertuxkart-0.7+dfsg1/configure.ac 2011-03-17 21:38:52.289430007 +0100 -@@ -460,7 +460,6 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -455,7 +455,6 @@ AC_CONFIG_FILES([ \ src/ide/Makefile \ src/bullet/Makefile \ src/bullet/src/Makefile \ - src/enet/Makefile \ + tools/Makefile ]) AC_OUTPUT - echo -e $SUMMARY Deleted: packages/trunk/supertuxkart/debian/patches/enet1.3.patch =================================================================== --- packages/trunk/supertuxkart/debian/patches/enet1.3.patch 2011-11-17 12:26:56 UTC (rev 12821) +++ packages/trunk/supertuxkart/debian/patches/enet1.3.patch 2011-11-17 12:51:00 UTC (rev 12822) @@ -1,27 +0,0 @@ ---- supertuxkart-0.7+dfsg1.orig/src/network/network_manager.cpp -+++ supertuxkart-0.7+dfsg1/src/network/network_manager.cpp -@@ -82,6 +82,7 @@ - - m_host = enet_host_create (& address /* the address to bind the server host to */, - stk_config->m_max_karts /* number of connections */, -+ 0 /* channel limit */, - 0 /* incoming bandwidth */, - 0 /* outgoing bandwidth */ ); - if (m_host == NULL) -@@ -107,6 +108,7 @@ - { - m_host = enet_host_create (NULL /* create a client host */, - 1 /* only allow 1 outgoing connection */, -+ 0 /* channel limit */, - 0 /* downstream bandwidth unlimited */, - 0 /* upstream bandwidth unlimited */ ); - -@@ -125,7 +127,7 @@ - address.port = UserConfigParams::m_server_port; - - /* Initiate the connection, allocating the two channels 0 and 1. */ -- peer = enet_host_connect (m_host, &address, 2); -+ peer = enet_host_connect (m_host, &address, 2, 0); - - if (peer == NULL) - { Modified: packages/trunk/supertuxkart/debian/patches/series =================================================================== --- packages/trunk/supertuxkart/debian/patches/series 2011-11-17 12:26:56 UTC (rev 12821) +++ packages/trunk/supertuxkart/debian/patches/series 2011-11-17 12:51:00 UTC (rev 12822) @@ -1,2 +1 @@ build-against-system-enet.patch -enet1.3.patch _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
