Source: gweled Version: 0.9.1-3 Severity: wishlist Tags: patch Dear Maintainer,
libmikmod's packaging has changed slightly, and it now provides an unversioned -dev package, libmikmod-dev. It still supports libmikmod2-dev but I would like to remove that in future, hence my request: I'd greatly appreciate it if you could build-depend on libmikmod-dev instead of libmikmod2-dev. In addition, to properly support multi-arch, libmikmod-config has been moved to a separate package. The recommended way to find libmikmod is now to use pkg-config. gweled currently uses libmikmod-config, so you'll need to either build-depend on libmikmod-config in addition to libmikmod-dev, or switch to pkg-config. The attached patch provides the necessary changes to switch to using pkg-config. The new version of libmikmod probably also fixes #588694 and #635268 since it now supports ALSA and PulseAudio directly. Regards, Stephen (the libmikmod maintainer) -- System Information: Debian Release: jessie/sid APT prefers testing APT policy: (500, 'testing'), (500, 'stable'), (200, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.13-1-amd64 (SMP w/8 CPU cores) Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages gweled depends on: ii libatk1.0-0 2.12.0-1 ii libc6 2.18-4 ii libcairo2 1.12.16-2 ii libfontconfig1 2.11.0-2 ii libfreetype6 2.5.2-1 ii libgdk-pixbuf2.0-0 2.30.6-1 ii libglib2.0-0 2.40.0-2 ii libgtk2.0-0 2.24.23-1 ii libmikmod3 3.3.6-2 ii libpango-1.0-0 1.36.3-1 ii libpangocairo-1.0-0 1.36.3-1 ii libpangoft2-1.0-0 1.36.3-1 ii librsvg2-2 2.40.2-1 gweled recommends no packages. gweled suggests no packages. -- no debconf information
diff -urN gweled-0.9.1/debian/control gweled-0.9.1.fixed/debian/control --- gweled-0.9.1/debian/control 2013-10-02 13:23:18.000000000 +0200 +++ gweled-0.9.1.fixed/debian/control 2014-04-17 20:07:55.549857494 +0200 @@ -7,7 +7,7 @@ libesd0-dev, libgtk2.0-dev (>= 2.14), librsvg2-dev, - libmikmod2-dev, + libmikmod-dev, intltool, hardening-wrapper, dh-autoreconf diff -urN gweled-0.9.1/debian/patches/004-use-pkg-config-for-mikmod.patch gweled-0.9.1.fixed/debian/patches/004-use-pkg-config-for-mikmod.patch --- gweled-0.9.1/debian/patches/004-use-pkg-config-for-mikmod.patch 1970-01-01 01:00:00.000000000 +0100 +++ gweled-0.9.1.fixed/debian/patches/004-use-pkg-config-for-mikmod.patch 2014-04-17 20:07:28.845284002 +0200 @@ -0,0 +1,53 @@ +Description: Use pkg-config to configure libmikmod +Author: Stephen Kitt <[email protected]> + +--- 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 -urN gweled-0.9.1/debian/patches/series gweled-0.9.1.fixed/debian/patches/series --- gweled-0.9.1/debian/patches/series 2013-10-02 13:23:18.000000000 +0200 +++ gweled-0.9.1.fixed/debian/patches/series 2014-04-17 20:00:21.292164944 +0200 @@ -1,2 +1,3 @@ 001-potfiles.patch 003-intools-update_ignore_quilt_directory.patch +004-use-pkg-config-for-mikmod.patch
