[cowdancer] 01/03: Revert "cowdancer: Use multiarch library path"

[James Clarke]

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

jrtc27 pushed a commit to branch master
in repository cowdancer.

commit a260ffbad60de2ebaaadc8d54f2bb9097a63215e
Author: James Clarke <jrtc27 at jrtc27.com>
Date:   Fri Jan 6 18:50:06 2017 +0000

    Revert "cowdancer: Use multiarch library path"
    
    This reverts commit d3630af2b4493d5ee54f6237b8f2c7cdc6dca2a3.
---
 debian/control           | 1 -
 debian/cowdancer.install | 3 +--
 debian/not-installed     | 3 +--
 debian/rules             | 5 +++++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index d0fcdf3..d733d56 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ 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 100755
new mode 100644
index 868d690..8505eb6
--- a/debian/cowdancer.install
+++ b/debian/cowdancer.install
@@ -1,8 +1,7 @@
-#!/usr/bin/dh-exec
 usr/bin/cow-shell
 usr/bin/cowdancer-ilistcreate
 usr/bin/cowdancer-ilistdump
-usr/lib/${DEB_HOST_MULTIARCH}/cowdancer/libcowdancer.so
+usr/lib/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 100755
new mode 100644
index 0141f5c..e79c889
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,2 +1 @@
-#!/usr/bin/dh-exec
-debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/cowdancer/libcowdancer.la
+debian/tmp/usr/lib/cowdancer/libcowdancer.la
diff --git a/debian/rules b/debian/rules
index 81a9733..7968d72 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,11 @@ 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