[Pkg-sdl-commits] [libsdl2] 01/01: Make the -dev package multiarch-ready

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to branch master
in repository libsdl2.

commit d461026ee1fcbc930d51c6ce51d343ef9ef7fcc2
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Sat Aug 5 10:09:25 2017 +0200

    Make the -dev package multiarch-ready
---
 debian/changelog               |  7 +++++++
 debian/control                 |  1 +
 debian/patches/no-libdir.patch | 38 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 4 files changed, 47 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c354ce2..c60a586 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libsdl2 (2.0.5+dfsg1-4) UNRELEASED; urgency=medium
+
+  * Team upload
+  * Make dev package finally multiarch
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Sat, 05 Aug 2017 08:54:04 +0200
+
 libsdl2 (2.0.5+dfsg1-3) unstable; urgency=medium
 
   * Switch to debhelper compat level v10
diff --git a/debian/control b/debian/control
index dff5fa2..3397adb 100644
--- a/debian/control
+++ b/debian/control
@@ -90,6 +90,7 @@ Depends:
  libxv-dev,
  libxxf86vm-dev,
  ${misc:Depends}
+Multi-Arch: same
 Conflicts:
  libsdl-1.3-dev
 Replaces:
diff --git a/debian/patches/no-libdir.patch b/debian/patches/no-libdir.patch
new file mode 100644
index 0000000..e61037e
--- /dev/null
+++ b/debian/patches/no-libdir.patch
@@ -0,0 +1,38 @@
+Description: This makes the -dev package multiarch
+Author: Gianfranco Costamagna <locutusofborg at debian.org>
+
+--- libsdl2-2.0.5+dfsg1.orig/sdl2-config.cmake.in
++++ libsdl2-2.0.5+dfsg1/sdl2-config.cmake.in
+@@ -5,7 +5,6 @@ set(exec_prefix "@exec_prefix@")
+ set(libdir "@libdir@")
+ set(SDL2_PREFIX "@prefix@")
+ set(SDL2_EXEC_PREFIX "@prefix@")
+-set(SDL2_LIBDIR "@libdir@")
+ set(SDL2_INCLUDE_DIRS "@includedir@/SDL2")
+-set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@")
++set(SDL2_LIBRARIES "@SDL_RLD_FLAGS@ @SDL_LIBS@")
+ string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES)
+--- libsdl2-2.0.5+dfsg1.orig/sdl2-config.in
++++ libsdl2-2.0.5+dfsg1/sdl2-config.in
+@@ -3,7 +3,6 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ exec_prefix_set=no
+-libdir=@libdir@
+ 
+ @ENABLE_STATIC_FALSE at usage="\
+ @ENABLE_STATIC_FALSE at Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
+@@ -45,11 +44,11 @@ while test $# -gt 0; do
+       echo -I at includedir@/SDL2 @SDL_CFLAGS@
+       ;;
+ @ENABLE_SHARED_TRUE@    --libs)
+- at ENABLE_SHARED_TRUE@      echo -L at libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
++ at ENABLE_SHARED_TRUE@      echo @SDL_RLD_FLAGS@ @SDL_LIBS@
+ @ENABLE_SHARED_TRUE@      ;;
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
+- at ENABLE_STATIC_TRUE@      echo -L at libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
++ at ENABLE_STATIC_TRUE@      echo @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
+ @ENABLE_STATIC_TRUE@      ;;
+     *)
+       echo "${usage}" 1>&2
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..e1e64f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+no-libdir.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sdl/packages/libsdl2.git