This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository uqm.
commit 0e51d77e471a7608ade26b034fdc6b54602f048e Author: Stephen Kitt <[email protected]> Date: Tue May 31 09:25:50 2016 +0200 Use pkg-config to pull in the libmikmod configuration This closes: #745094. --- debian/changelog | 8 ++++++++ debian/control | 1 + debian/patches/libmikmod-pkg-config.patch | 18 ++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 28 insertions(+) diff --git a/debian/changelog b/debian/changelog index c8e4f90..6e90fc7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +uqm (0.6.2.dfsg-9.3) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use pkg-config to pull in the libmikmod configuration, closes: + #745094. + + -- Stephen Kitt <[email protected]> Mon, 30 May 2016 18:31:21 +0200 + uqm (0.6.2.dfsg-9.2) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/control b/debian/control index 5e9541e..90c5596 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 5), libsdl1.2-dev, libz-dev, libmikmod-dev, + pkg-config, Standards-Version: 3.8.0 Homepage: http://sc2.sourceforge.net/ Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/uqm.git diff --git a/debian/patches/libmikmod-pkg-config.patch b/debian/patches/libmikmod-pkg-config.patch new file mode 100644 index 0000000..afe0129 --- /dev/null +++ b/debian/patches/libmikmod-pkg-config.patch @@ -0,0 +1,18 @@ +Description: Use pkg-config to find libmikmod +Author: Stephen Kitt <[email protected]> + +--- a/sc2/build/unix/config_proginfo_host ++++ b/sc2/build/unix/config_proginfo_host +@@ -201,9 +201,9 @@ + + ### libmikmod ### + LIB_libmikmod_NAME="libmikmod" +-LIB_libmikmod_CFLAGS="$(libmikmod-config --cflags)" +-LIB_libmikmod_LDFLAGS="$(libmikmod-config --libs)" +-LIB_libmikmod_VERSION="$(libmikmod-config --version)" ++LIB_libmikmod_CFLAGS="$(pkg-config --cflags libmikmod)" ++LIB_libmikmod_LDFLAGS="$(pkg-config --libs libmikmod)" ++LIB_libmikmod_VERSION="$(pkg-config --modversion libmikmod)" + + + ### zlib ### diff --git a/debian/patches/series b/debian/patches/series index b8c125b..5017c7c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ uqm.patch +libmikmod-pkg-config.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/uqm.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
