[Pkg-sdl-commits] [SCM] Packaging of SDL_net branch, master, updated. debian/1.2.7-3

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit c5c7fb105ac8c72c7c68b453af1c9835a02b06d4
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sun Dec 4 17:35:00 2011 +0000

    Convert to quilt, refresh and document (as per DEP-3) UDP_Bind.patch

diff --git a/debian/changelog b/debian/changelog
index 024ae88..3991881 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ sdl-net1.2 (1.2.7-3) unstable; urgency=low
       only acting when deviating from auto behaviour
   * Added 'source/format', with '3.0 (quilt)'
     - Removed dependency on dpatch
+    - Convert patches, documenting and refreshing them
   * Convert ${pkg}.dirs and ${pkg}.files into ${pkg}.install
   * Updating 'watch' file to version=3
   * Added Vcs-Git and Vcs-Browser in 'control' file
diff --git a/debian/patches/30_UDP_Bind.dpatch b/debian/patches/UDP_Bind.patch
similarity index 50%
rename from debian/patches/30_UDP_Bind.dpatch
rename to debian/patches/UDP_Bind.patch
index dd3a683..b17e0a4 100644
--- a/debian/patches/30_UDP_Bind.dpatch
+++ b/debian/patches/UDP_Bind.patch
@@ -1,14 +1,25 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_UDP_Bind.dpatch by Mike Furr <mfurr at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+Description: SDLNet_UDP_Bind does not behave as described
+ Original bug report:
+   The comment, which is the same as in the header file, describes one behaviour.
+   The code implements another: if channel is -1, it binds to the first channel
+   that has not yet been bound to the maximum number of addresses. The if
+   (binding->numbound... line should be just if ( binding->numbound) {
+   (i.e. choose an unused channel). (Although this may break any apps using the
+   incorrect behaviour.)
+ .
+ Debian changelog:
+   * Changed comment for SDLNet_UDP_Bind to reflect implementation
+     - Since upstream has not responded to this (and seems dead), and a fair
+       number of packages use sdl-net, I don't want to change the behavior
+       just for debian, only properly document the actual behavior.
+     - (Closes: 211570)
+Author: cph at cph.demon.co.uk
+Last-Update: 2003-09-18
+Bug-Debian: http://bugs.debian.org/211570
 
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./SDL_net.h /tmp/dpep-work.2ZTFdH/sdl-net1.2-1.2.5/SDL_net.h
---- ./SDL_net.h	2005-07-02 18:37:55.456806943 -0400
-+++ /tmp/dpep-work.2ZTFdH/sdl-net1.2-1.2.5/SDL_net.h	2005-07-02 18:39:23.411344052 -0400
-@@ -166,7 +166,8 @@
+--- a/SDL_net.h
++++ b/SDL_net.h
+@@ -190,7 +190,8 @@
  extern DECLSPEC UDPsocket SDLCALL SDLNet_UDP_Open(Uint16 port);
  
  /* Bind the address 'address' to the requested channel on the UDP socket.
@@ -18,10 +29,9 @@ diff -urNad --exclude=CVS --exclude=.svn ./SDL_net.h /tmp/dpep-work.2ZTFdH/sdl-n
     the given address as it's primary address.
     If the channel is already bound, this new address will be added to the
     list of valid source addresses for packets arriving on the channel.
-diff -urNad --exclude=CVS --exclude=.svn ./SDLnetUDP.c /tmp/dpep-work.2ZTFdH/sdl-net1.2-1.2.5/SDLnetUDP.c
---- ./SDLnetUDP.c	2003-02-09 19:33:26.000000000 -0500
-+++ /tmp/dpep-work.2ZTFdH/sdl-net1.2-1.2.5/SDLnetUDP.c	2005-07-02 18:37:55.978738926 -0400
-@@ -413,7 +413,8 @@
+--- a/SDLnetUDP.c
++++ b/SDLnetUDP.c
+@@ -415,7 +415,8 @@
  }
  
  /* Bind the address 'address' to the requested channel on the UDP socket.
diff --git a/debian/patches/series b/debian/patches/series
index 8333b8d..cd94562 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 arm.patch
 endian.patch
-30_UDP_Bind.dpatch
+UDP_Bind.patch

-- 
Packaging of SDL_net