[Pkg-sdl-commits] [SCM] Debian packaging of SDL 1.3 branch, master, updated. debian/1.3.0_20111204-1-10-g1b68f07

[Sam Hocevar]

The following commit has been merged in the master branch:
commit 1b68f072e1120dc6de112f70575f948b5963cce4
Author: Sam Hocevar <sam at hocevar.net>
Date:   Fri May 18 00:48:40 2012 +0200

    debian/patches/external_header_paths.diff: provide additional CFLAGS
    so that headers such as SDL_syswm.h can be included (Closes: #669363).

diff --git a/debian/changelog b/debian/changelog
index bac5008..e8500b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ libsdl2 (2.0~20120220c-1) UNRELEASED; urgency=low
 
   * debian/patches/fix_joystick_misc_axes.diff: fix a joystick remapping
     bug causing some axes to malfunction.
+  * debian/patches/external_header_paths.diff: provide additional CFLAGS
+    so that headers such as SDL_syswm.h can be included (Closes: #669363).
 
  -- Sam Hocevar <sho at debian.org>  Thu, 17 May 2012 19:03:59 +0200
 
diff --git a/debian/patches/300_dont_propagate_lpthread.diff b/debian/patches/300_dont_propagate_lpthread.diff
index f8ed2d7..fdfeb57 100644
--- a/debian/patches/300_dont_propagate_lpthread.diff
+++ b/debian/patches/300_dont_propagate_lpthread.diff
@@ -3,10 +3,10 @@
  sdl2.pc.in     |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-Index: SDL-1.2.14/sdl2.pc.in
+Index: libsdl2/sdl2.pc.in
 ===================================================================
---- SDL-1.2.14.orig/sdl2.pc.in	2009-10-12 19:07:20.000000000 -0400
-+++ SDL-1.2.14/sdl2.pc.in	2009-11-28 09:21:57.000000000 -0500
+--- libsdl2.orig/sdl2.pc.in	2012-05-18 00:51:07.802411954 +0200
++++ libsdl2/sdl2.pc.in	2012-05-18 00:51:26.270961566 +0200
 @@ -10,6 +10,6 @@
  Version: @SDL_VERSION@
  Requires:
@@ -14,13 +14,13 @@ Index: SDL-1.2.14/sdl2.pc.in
 -Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@
 +Libs: -L${libdir} @SDL_RLD_FLAGS@ -lSDL2
  Libs.private: @SDL_STATIC_LIBS@
- Cflags: -I${includedir}/SDL @SDL_CFLAGS@
-Index: SDL-1.2.14/sdl2-config.in
+ Cflags: -I${includedir}/SDL2 @SDL_CFLAGS@
+Index: libsdl2/sdl2-config.in
 ===================================================================
---- SDL-1.2.14.orig/sdl2-config.in	2009-10-12 19:07:20.000000000 -0400
-+++ SDL-1.2.14/sdl2-config.in	2009-11-28 09:21:04.000000000 -0500
+--- libsdl2.orig/sdl2-config.in	2012-05-18 00:51:07.802411954 +0200
++++ libsdl2/sdl2-config.in	2012-05-18 00:51:26.270961566 +0200
 @@ -45,7 +45,7 @@
-       echo -I at includedir@/SDL @SDL_CFLAGS@
+       echo -I at includedir@/SDL2 @SDL_CFLAGS@
        ;;
  @ENABLE_SHARED_TRUE@    --libs)
 - at ENABLE_SHARED_TRUE@      echo -L at libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
diff --git a/debian/patches/external_header_paths.diff b/debian/patches/external_header_paths.diff
new file mode 100644
index 0000000..0a3bfc8
--- /dev/null
+++ b/debian/patches/external_header_paths.diff
@@ -0,0 +1,23 @@
+Index: libsdl2/sdl2-config.in
+===================================================================
+--- libsdl2.orig/sdl2-config.in	2012-05-18 00:51:13.076995010 +0200
++++ libsdl2/sdl2-config.in	2012-05-18 00:51:13.089000887 +0200
+@@ -42,7 +42,7 @@
+       echo @SDL_VERSION@
+       ;;
+     --cflags)
+-      echo -I at includedir@/SDL2 @SDL_CFLAGS@
++      echo -I at includedir@/SDL2 @SDL_CFLAGS@ @EXTRA_CFLAGS@
+       ;;
+ @ENABLE_SHARED_TRUE@    --libs)
+ @ENABLE_SHARED_TRUE@      echo -L at libdir@ @SDL_RLD_FLAGS@ -lSDL2
+Index: libsdl2/sdl2.pc.in
+===================================================================
+--- libsdl2.orig/sdl2.pc.in	2012-05-18 00:51:13.076995010 +0200
++++ libsdl2/sdl2.pc.in	2012-05-18 00:51:13.089000887 +0200
+@@ -12,4 +12,4 @@
+ Conflicts:
+ Libs: -L${libdir} @SDL_RLD_FLAGS@ -lSDL2
+ Libs.private: @SDL_STATIC_LIBS@
+-Cflags: -I${includedir}/SDL2 @SDL_CFLAGS@
++Cflags: -I${includedir}/SDL2 @SDL_CFLAGS@ @EXTRA_CFLAGS@
diff --git a/debian/patches/fix_joystick_misc_axes.diff b/debian/patches/fix_joystick_misc_axes.diff
index 350fd55..0551009 100644
--- a/debian/patches/fix_joystick_misc_axes.diff
+++ b/debian/patches/fix_joystick_misc_axes.diff
@@ -1,8 +1,8 @@
-diff --git a/SDL/src/joystick/linux/SDL_sysjoystick.c b/SDL/src/joystick/linux/SDL_sysjoystick.c
-index 1017f22..47e7987 100755
---- a/SDL/src/joystick/linux/SDL_sysjoystick.c
-+++ b/SDL/src/joystick/linux/SDL_sysjoystick.c
-@@ -703,7 +703,7 @@ EV_ConfigJoystick(SDL_Joystick * joystick, int fd)
+Index: libsdl2/SDL/src/joystick/linux/SDL_sysjoystick.c
+===================================================================
+--- libsdl2.orig/SDL/src/joystick/linux/SDL_sysjoystick.c	2012-05-18 00:51:07.758390396 +0200
++++ libsdl2/SDL/src/joystick/linux/SDL_sysjoystick.c	2012-05-18 00:51:13.084998927 +0200
+@@ -703,7 +703,7 @@
                  ++joystick->nbuttons;
              }
          }
diff --git a/debian/patches/series b/debian/patches/series
index a2ee0d8..2617554 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
 ####310_fixmouseclicks
 ####320_disappearingcursor.diff
 fix_joystick_misc_axes.diff
+external_header_paths.diff

-- 
Debian packaging of SDL 1.3