[cowdancer] 01/02: cowdancer: Use multiarch library path

[James Clarke]

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

jrtc27-guest pushed a commit to branch master
in repository cowdancer.

commit d3630af2b4493d5ee54f6237b8f2c7cdc6dca2a3
Author: James Clarke <jrtc27 at jrtc27.com>
Date:   Mon Dec 5 00:26:33 2016 +0000

    cowdancer: Use multiarch library path
    
    Since libcowdancer is part of the cowdancer binary package, it's still
    not coinstallable, but might as well put it in the right place.
    
    Unfortunately, debian/not-installed does not have wildcards expanded, so
    the use of dh-exec is necessary.
---
 debian/control           | 1 +
 debian/cowdancer.install | 3 ++-
 debian/not-installed     | 3 ++-
 debian/rules             | 5 -----
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 2fdaeeb..a1aa313 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Section: utils
 Priority: optional
 Build-Depends: cpio,
                debhelper (>= 10),
+               dh-exec,
                klibc-utils [linux-any],
                libklibc-dev [linux-any],
                libncurses-dev,
diff --git a/debian/cowdancer.install b/debian/cowdancer.install
old mode 100644
new mode 100755
index 8505eb6..868d690
--- a/debian/cowdancer.install
+++ b/debian/cowdancer.install
@@ -1,7 +1,8 @@
+#!/usr/bin/dh-exec
 usr/bin/cow-shell
 usr/bin/cowdancer-ilistcreate
 usr/bin/cowdancer-ilistdump
-usr/lib/cowdancer/libcowdancer.so
+usr/lib/${DEB_HOST_MULTIARCH}/cowdancer/libcowdancer.so
 usr/share/man/man1/cow-shell.1
 usr/share/man/man1/cowdancer-ilistcreate.1
 usr/share/man/man1/cowdancer-ilistdump.1
diff --git a/debian/not-installed b/debian/not-installed
old mode 100644
new mode 100755
index e79c889..0141f5c
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1 +1,2 @@
-debian/tmp/usr/lib/cowdancer/libcowdancer.la
+#!/usr/bin/dh-exec
+debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/cowdancer/libcowdancer.la
diff --git a/debian/rules b/debian/rules
index 7968d72..81a9733 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,11 +16,6 @@ endif
 %:
 	dh $@
 
-# Multiarch is not supported (and irrelevant), since libcowdancer is the only
-# shared library and is internal
-override_dh_auto_configure:
-	dh_auto_configure -- --libdir='$${prefix}/lib' --libexecdir='$${prefix}/lib'
-
 override_dh_install:
 	dh_install --fail-missing
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pbuilder/cowdancer.git