r11912 - in packages/trunk/blockattack/debian: . patches

[Ansgar Burchardt]

Author: ansgar
Date: 2011-03-12 18:09:55 +0000 (Sat, 12 Mar 2011)
New Revision: 11912

Added:
   packages/trunk/blockattack/debian/patches/enet-1.3.1.patch
Modified:
   packages/trunk/blockattack/debian/changelog
   packages/trunk/blockattack/debian/control
   packages/trunk/blockattack/debian/patches/series
Log:
* Team upload.
* Build with enet 1.3.1.
  + new patch: enet-1.3.1.patch

Modified: packages/trunk/blockattack/debian/changelog
===================================================================
--- packages/trunk/blockattack/debian/changelog	2011-03-12 13:57:24 UTC (rev 11911)
+++ packages/trunk/blockattack/debian/changelog	2011-03-12 18:09:55 UTC (rev 11912)
@@ -1,3 +1,11 @@
+blockattack (1.4.1+ds1-2) unstable; urgency=low
+
+  * Team upload.
+  * Build with enet 1.3.1.
+    + new patch: enet-1.3.1.patch
+
+ -- Ansgar Burchardt <ansgar at debian.org>  Sat, 12 Mar 2011 19:03:54 +0100
+
 blockattack (1.4.1+ds1-1) unstable; urgency=low
 
   * Team upload.

Modified: packages/trunk/blockattack/debian/control
===================================================================
--- packages/trunk/blockattack/debian/control	2011-03-12 13:57:24 UTC (rev 11911)
+++ packages/trunk/blockattack/debian/control	2011-03-12 18:09:55 UTC (rev 11912)
@@ -11,7 +11,7 @@
  libsdl-mixer1.2-dev,
  libsdl-image1.2-dev,
  libsdl1.2-dev,
- libenet-dev (>= 1.2-3),
+ libenet-dev (>= 1.3.1),
  libphysfs-dev,
  scons
 Standards-Version: 3.9.1

Added: packages/trunk/blockattack/debian/patches/enet-1.3.1.patch
===================================================================
--- packages/trunk/blockattack/debian/patches/enet-1.3.1.patch	                        (rev 0)
+++ packages/trunk/blockattack/debian/patches/enet-1.3.1.patch	2011-03-12 18:09:55 UTC (rev 11912)
@@ -0,0 +1,30 @@
+From: Ansgar Burchardt <ansgar at debian.org>
+Date: Sat, 12 Mar 2011 19:02:46 +0100
+Subject: Changes to compile with enet 1.3.1.
+--- blockattack.orig/source/code/NetworkThing.hpp
++++ blockattack/source/code/NetworkThing.hpp
+@@ -134,6 +134,7 @@
+ 
+             server = enet_host_create (& address /* the address to bind the server host to */,
+                                        1      /* allow up to 1 clients and/or outgoing connections */,
++				       0      /* no channel limit */,
+                                        0      /* assume any amount of incoming bandwidth */,
+                                        0      /* assume any amount of outgoing bandwidth */);
+             if (server == NULL)
+@@ -163,6 +164,7 @@
+         ntDisconnect();
+         client = enet_host_create (NULL /* create a client host */,
+                                    1 /* only allow 1 outgoing connection */,
++				   0 /* no channel limit */,
+                                    0 /* Unlimited downstream bandwidth */,
+                                    0 /* Unlimted upstream bandwidth */);
+ 
+@@ -173,7 +175,7 @@
+         else
+         {
+             /* Initiate the connection, allocating the four channels 0 and 1 and 2 and 3. */
+-            peer = enet_host_connect (client, & address, 4);
++            peer = enet_host_connect (client, & address, 4, 0);
+ 
+             if (peer == NULL)
+             {

Modified: packages/trunk/blockattack/debian/patches/series
===================================================================
--- packages/trunk/blockattack/debian/patches/series	2011-03-12 13:57:24 UTC (rev 11911)
+++ packages/trunk/blockattack/debian/patches/series	2011-03-12 18:09:55 UTC (rev 11912)
@@ -1,3 +1,4 @@
 gcc44.diff
 fix-scons-paths.patch
 fix-spelling-errors.patch
+enet-1.3.1.patch