[gweled] 64/72: Build-depend on libmikmod-dev and use pkg-config to find libmikmod.

[Stephen Kitt]

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

skitt pushed a commit to branch debian-sid
in repository gweled.

commit c9405601635d88ffc789366bb6de1553856a831c
Author: Stephen Kitt <skitt at debian.org>
Date:   Thu May 26 18:09:10 2016 +0200

    Build-depend on libmikmod-dev and use pkg-config to find libmikmod.
---
 debian/changelog                                   |  2 +
 debian/control                                     |  2 +-
 debian/patches/004-use-pkg-config-for-mikmod.patch | 53 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 406bd65..b1677c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ gweled (0.9.1-4) UNRELEASED; urgency=medium
 
   * Adopt the package for the Debian Games Team, thanks Ondřej Surý for
     taking care of it for so long! (Closes: #824504.)
+  * Build-depend on libmikmod-dev and use pkg-config to find libmikmod.
+    (Closes: #745072.)
 
  -- Stephen Kitt <skitt at debian.org>  Thu, 26 May 2016 17:47:31 +0200
 
diff --git a/debian/control b/debian/control
index 89ad318..a96bb3d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9),
 	       libesd0-dev,
 	       libgtk2.0-dev (>= 2.14),
 	       librsvg2-dev,
-	       libmikmod2-dev,
+	       libmikmod-dev,
 	       intltool,
 	       hardening-wrapper,
 	       dh-autoreconf
diff --git a/debian/patches/004-use-pkg-config-for-mikmod.patch b/debian/patches/004-use-pkg-config-for-mikmod.patch
new file mode 100644
index 0000000..92a95b2
--- /dev/null
+++ b/debian/patches/004-use-pkg-config-for-mikmod.patch
@@ -0,0 +1,53 @@
+Description: Use pkg-config to configure libmikmod
+Author: Stephen Kitt <skitt at debian.org>
+
+--- a/configure.in
++++ b/configure.in
+@@ -36,12 +36,10 @@
+ AC_SUBST(RSVG_LIBS)
+ 
+ #### Check for mikmod.h header ####
+-AC_CHECK_HEADER(mikmod.h,, AC_MSG_ERROR([libmikmod is required to compile gweled]))
++PKG_CHECK_MODULES([libmikmod], [libmikmod],, AC_MSG_ERROR([libmikmod is required to compile gweled]))
+ 
+-MIKMOD_CFLAGS=`libmikmod-config --cflags`
+-MIKMOD_LIBS=`libmikmod-config --libs`
+-AC_SUBST(MIKMOD_CFLAGS)
+-AC_SUBST(MIKMOD_LIBS)
++AC_SUBST(libmikmod_CFLAGS)
++AC_SUBST(libmikmod_LIBS)
+ 
+ AC_CHECK_HEADER(pthread.h, [],
+                   AC_MSG_ERROR([*** Cannot find pthread.h header]))
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -176,8 +176,8 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+-MIKMOD_CFLAGS = @MIKMOD_CFLAGS@
+-MIKMOD_LIBS = @MIKMOD_LIBS@
++MIKMOD_CFLAGS = @libmikmod_CFLAGS@
++MIKMOD_LIBS = @libmikmod_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -9,7 +9,7 @@
+ AM_CFLAGS = 		  \
+     @GTK_CFLAGS@      \
+ 	@RSVG_CFLAGS@	  \
+-	@MIKMOD_CFLAGS@   \
++	@libmikmod_CFLAGS@   \
+ 	@PTHREAD_CFLAGS@
+ 
+ bin_PROGRAMS = gweled
+@@ -29,6 +29,6 @@
+ 	games-setgid-io.c games-setgid-io.h \
+ 	games-scores-dialog-private.h
+ 
+-gweled_LDADD = @GTK_LIBS@ @RSVG_LIBS@ @MIKMOD_LIBS@ @PTHREAD_LIBS@
++gweled_LDADD = @GTK_LIBS@ @RSVG_LIBS@ @libmikmod_LIBS@ @PTHREAD_LIBS@
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index d030f8e..8e320f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 001-potfiles.patch
 003-intools-update_ignore_quilt_directory.patch
+004-use-pkg-config-for-mikmod.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gweled.git