[Pkg-mpd-commits] [gmpc-plugins] 01/02: Correct awn installation

[Etienne Millon]

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

emillon-guest pushed a commit to branch mentors
in repository gmpc-plugins.

commit dad008bb3fd69ecb1dda82da87d3aee21a662dc7
Author: Etienne Millon <me at emillon.org>
Date:   Sun Oct 13 12:26:05 2013 +0200

    Correct awn installation
---
 debian/changelog                                    |    1 -
 .../0002-Correct-directory-for-gmpc-awn.patch       |   19 -------------------
 debian/patches/series                               |    1 -
 debian/rules                                        |    5 +++++
 4 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 504f263..e2cf15e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,6 @@ gmpc-plugins (11.8.16-2) UNRELEASED; urgency=low
     - Use multi-arch directories
     - Enable hardening flags
   * Use dh-autoreconf
-  * New patch setting correct directory for gmpc-awn
   * Bump Standards-Version to 3.9.4 (no changes needed)
   * Update my email address
   * Drop version bounds satisfied in oldstable
diff --git a/debian/patches/0002-Correct-directory-for-gmpc-awn.patch b/debian/patches/0002-Correct-directory-for-gmpc-awn.patch
deleted file mode 100644
index 7ee2a81..0000000
--- a/debian/patches/0002-Correct-directory-for-gmpc-awn.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Etienne Millon <me at emillon.org>
-Date: Wed, 20 Jun 2012 13:27:51 +0200
-Subject: Correct directory for gmpc-awn
-
-Without this plugin, it would install its libraries to /usr/lib.
----
- gmpc-awn/src/Makefile.am |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gmpc-awn/src/Makefile.am b/gmpc-awn/src/Makefile.am
-index e4a6479..6ebb3d2 100644
---- a/gmpc-awn/src/Makefile.am
-+++ b/gmpc-awn/src/Makefile.am
-@@ -1,4 +1,4 @@
--libdir=${prefix}/lib/gmpc/plugins/
-+plugindir=${libdir}/gmpc/plugins/
- 
- lib_LTLIBRARIES = awnplugin.la
- 
diff --git a/debian/patches/series b/debian/patches/series
index 9ae4394..f7528c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-Fix-typo-Psychadelic-Psychedelic.patch
-0002-Correct-directory-for-gmpc-awn.patch
diff --git a/debian/rules b/debian/rules
index 482f74a..5797a8a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,11 @@ override_dh_auto_configure:
 override_dh_strip:
 	dh_strip $(DEB_DH_STRIP_ARGS)
 
+override_dh_install:
+	mv debian/tmp/usr/lib/gmpc/plugins/awnplugin.so \
+	   debian/tmp/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/gmpc/plugins
+	dh_install
+
 override_dh_clean:
 	dh_clean
 	rm -f config.status config.log

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/gmpc-plugins.git