[SCM] libopenmpt/master: Use upstream's version of libmodplug.pc now that it's fixed

[jcowgill at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 174fc6025f638b9b1111351a8887aa11f59f30bb
Author: James Cowgill <jcowgill at debian.org>
Date:   Sun Mar 19 21:49:31 2017 +0000

    Use upstream's version of libmodplug.pc now that it's fixed

diff --git a/debian/control b/debian/control
index ffd4923..24ee5fa 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders: James Cowgill <jcowgill at debian.org>
 Build-Depends:
  debhelper (>= 10~),
+ dh-exec,
  doxygen,
  dpkg-dev (>= 1.18.0),
  libflac-dev,
@@ -94,7 +95,10 @@ Package: libopenmpt-modplug-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libopenmpt-modplug1 (= ${binary:Version}), ${misc:Depends}
+Depends:
+ libopenmpt-dev,
+ libopenmpt-modplug1 (= ${binary:Version}),
+ ${misc:Depends}
 Conflicts: libmodplug-dev
 Description: module music library based on OpenMPT -- modplug compat development files
  libopenmpt is a cross-platform C++ and C library to decode tracked music
diff --git a/debian/libmodplug.pc.in b/debian/libmodplug.pc.in
deleted file mode 100644
index 3e6e2f4..0000000
--- a/debian/libmodplug.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${prefix}/lib/@DEB_HOST_MULTIARCH@
-includedir=${prefix}/include
-
-Name: libmodplug
-Description: The ModPlug mod file playing library (emulated via libopenmpt).
-Version: 0.8.8.5
-Libs: -L${libdir} -lmodplug
-Cflags: -I${includedir}
diff --git a/debian/libopenmpt-modplug-dev.install b/debian/libopenmpt-modplug-dev.install
old mode 100644
new mode 100755
index 376f507..bdaa61a
--- a/debian/libopenmpt-modplug-dev.install
+++ b/debian/libopenmpt-modplug-dev.install
@@ -1,2 +1,4 @@
-libmodplug/*.h usr/include/libmodplug
+#!/usr/bin/dh-exec
+libmodplug/*.h           usr/include/libmodplug
+libmodplug/libmodplug.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
 usr/lib/*/libopenmpt_modplug.so
diff --git a/debian/libopenmpt-modplug-dev.links b/debian/libopenmpt-modplug-dev.links
new file mode 100755
index 0000000..90057fa
--- /dev/null
+++ b/debian/libopenmpt-modplug-dev.links
@@ -0,0 +1,2 @@
+#!/usr/bin/dh-exec
+usr/lib/${DEB_HOST_MULTIARCH}/libopenmpt_modplug.so usr/lib/${DEB_HOST_MULTIARCH}/libmodplug.so
diff --git a/debian/rules b/debian/rules
index a634764..c29c132 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,9 +21,3 @@ override_dh_auto_configure:
 
 override_dh_installchangelogs:
 	dh_installchangelogs libopenmpt/dox/changelog.md
-
-override_dh_install:
-	dh_install
-	mkdir -p $(MODPLUG_DEV_LIBDIR)/pkgconfig
-	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/' debian/libmodplug.pc.in > $(MODPLUG_DEV_LIBDIR)/pkgconfig/libmodplug.pc
-	ln -s libopenmpt_modplug.so $(MODPLUG_DEV_LIBDIR)/libmodplug.so

-- 
libopenmpt packaging