[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 c6ffc22b5c4c5b4cacf726c34dd86a271aab4cc0
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sun Dec 4 18:05:04 2011 +0000

    New patch to ship pkg-config files (Closes: #631085), thanks Roman Vasiyarov <rvasiyarov at gmail.com> for reporting

diff --git a/debian/changelog b/debian/changelog
index 3991881..8053fe6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 sdl-net1.2 (1.2.7-3) unstable; urgency=low
 
   * New maintainer
-    - Added as part of SDL team
+    - Make package as part of SDL team
     - Add myself to uploaders, and setting DM-Upload-Allowed: yes
+  * Incorporated changes from Roman Vasiyarov <rvasiyarov at gmail.com>:
+    - Added pkg-config files (Closes: #631085)
   * Bump Standards-Version to 3.9.2 (no changes needed)
   * Changed debhelper compat to level 8 (level 4 before):
     - Updated dependency on debhelper to (>= 8.0.0)
@@ -14,9 +16,9 @@ sdl-net1.2 (1.2.7-3) unstable; urgency=low
   * Convert ${pkg}.dirs and ${pkg}.files into ${pkg}.install
   * Updating 'watch' file to version=3
   * Added Vcs-Git and Vcs-Browser in 'control' file
-  * Shipping pkg-config files
   * Modifications to dependencies and build options:
     - Depending on newer dpkg-dev
+    - Depending on SDL >= 1.2.14 (instead of misc old versions)
     - Removed Conflict dependencies on libsdl-net1.1. It's very old and not
       present in any of the last Debian releases, long unsupported.
   * debian/copyright: updated and converted to DEP-5
diff --git a/debian/libsdl-net1.2-dev.install b/debian/libsdl-net1.2-dev.install
index 705b182..c81d0eb 100644
--- a/debian/libsdl-net1.2-dev.install
+++ b/debian/libsdl-net1.2-dev.install
@@ -2,3 +2,4 @@ usr/include
 usr/lib/lib*.a
 usr/lib/lib*.la
 usr/lib/lib*.so
+usr/lib/pkgconfig
diff --git a/debian/patches/pkgconfig_hgd61d0055d08c.patch b/debian/patches/pkgconfig_hgd61d0055d08c.patch
new file mode 100644
index 0000000..bb75ab2
--- /dev/null
+++ b/debian/patches/pkgconfig_hgd61d0055d08c.patch
@@ -0,0 +1,49 @@
+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 cd94562..d925daa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 arm.patch
 endian.patch
 UDP_Bind.patch
+pkgconfig_hgd61d0055d08c.patch

-- 
Packaging of SDL_net