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

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit fc980ba83802118752b0a3fa5a411febe8ac0acf
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Fri Jan 20 14:50:04 2012 +0000

    Refresh patches and remove pkgconfig_hgd61d0055d08c.patch, which was picked up from upstream

diff --git a/debian/patches/UDP_Bind.patch b/debian/patches/UDP_Bind.patch
index b17e0a4..4faa017 100644
--- a/debian/patches/UDP_Bind.patch
+++ b/debian/patches/UDP_Bind.patch
@@ -19,8 +19,8 @@ Bug-Debian: http://bugs.debian.org/211570
 
 --- a/SDL_net.h
 +++ b/SDL_net.h
-@@ -190,7 +190,8 @@
- extern DECLSPEC UDPsocket SDLCALL SDLNet_UDP_Open(Uint16 port);
+@@ -200,7 +200,8 @@
+ extern DECLSPEC void SDLCALL SDLNet_UDP_SetPacketLoss(UDPsocket sock, int percent);
  
  /* Bind the address 'address' to the requested channel on the UDP socket.
 -   If the channel is -1, then the first unbound channel will be bound with
@@ -31,7 +31,7 @@ Bug-Debian: http://bugs.debian.org/211570
     list of valid source addresses for packets arriving on the channel.
 --- a/SDLnetUDP.c
 +++ b/SDLnetUDP.c
-@@ -415,7 +415,8 @@
+@@ -246,7 +246,8 @@
  }
  
  /* Bind the address 'address' to the requested channel on the UDP socket.
diff --git a/debian/patches/arm.patch b/debian/patches/arm.patch
index f9a6708..023a6d5 100644
--- a/debian/patches/arm.patch
+++ b/debian/patches/arm.patch
@@ -8,7 +8,7 @@ Bug-Debian: http://bugs.debian.org/212570
 
 --- a/SDL_net.h
 +++ b/SDL_net.h
-@@ -344,7 +344,7 @@
+@@ -354,7 +354,7 @@
  /* Inline macro functions to read/write network data */
  
  /* Warning, some systems have data access alignment restrictions */
diff --git a/debian/patches/pkgconfig_hgd61d0055d08c.patch b/debian/patches/pkgconfig_hgd61d0055d08c.patch
deleted file mode 100644
index bb75ab2..0000000
--- a/debian/patches/pkgconfig_hgd61d0055d08c.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Description: missing pkgconfig files
- Roman Vasiyarov <rvasiyarov at gmail.com> reported:
- "There were no upstream releases with pkgconfig support yet, so I
- backported that from upstream hg."
-Bug-Debian: http://bugs.debian.org/631085
-Author: Sam Lantinga <slouken at libsdl.org>
-Origin: upstream, http://hg.libsdl.org/SDL_net/rev/d61d0055d08c
-Bug: http://bugzilla.libsdl.org/show_bug.cgi?id=1004
-Last-Update: 2011-06-20
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -65,3 +65,5 @@
- rpm: $(PACKAGE)-$(VERSION).tar.gz
- 	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
- 
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = SDL_net.pc
---- /dev/null
-+++ b/SDL_net.pc.in
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: SDL_net
-+Description: net library for Simple DirectMedia Layer
-+Version: @VERSION@
-+Requires: sdl >= @SDL_VERSION@
-+Libs: -L${libdir} -lSDL_net
-+Cflags: -I${includedir}/SDL
---- a/configure.in
-+++ b/configure.in
-@@ -100,6 +100,7 @@
- 
- dnl Check for SDL
- SDL_VERSION=1.2.4
-+AC_SUBST(SDL_VERSION)
- AM_PATH_SDL($SDL_VERSION,
-             :,
- 	    AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
-@@ -130,5 +131,5 @@
- 
- # Finally create all the generated files
- AC_OUTPUT([
--Makefile SDL_net.spec SDL_net.qpg
-+Makefile SDL_net.spec SDL_net.qpg SDL_net.pc
- ])
diff --git a/debian/patches/series b/debian/patches/series
index d925daa..cd94562 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 arm.patch
 endian.patch
 UDP_Bind.patch
-pkgconfig_hgd61d0055d08c.patch

-- 
Packaging of SDL_net