[blockattack] 75/88: * Team upload. * Build with enet 1.3.1. + new patch: enet-1.3.1.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository blockattack.

commit 9dc9cd34339b249c960d10b420289e32f9dacfcb
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Sat Mar 12 18:09:55 2011 +0000

    * Team upload.
    * Build with enet 1.3.1.
      + new patch: enet-1.3.1.patch
---
 debian/changelog                |  8 ++++++++
 debian/control                  |  2 +-
 debian/patches/enet-1.3.1.patch | 30 ++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 4 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8907989..0836c60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
diff --git a/debian/control b/debian/control
index 0c39d4c..76a2b6d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 7.0.50~),
  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
diff --git a/debian/patches/enet-1.3.1.patch b/debian/patches/enet-1.3.1.patch
new file mode 100644
index 0000000..02f759a
--- /dev/null
+++ b/debian/patches/enet-1.3.1.patch
@@ -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)
+             {
diff --git a/debian/patches/series b/debian/patches/series
index a559ef4..e898183 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 gcc44.diff
 fix-scons-paths.patch
 fix-spelling-errors.patch
+enet-1.3.1.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/blockattack.git