[cowdancer] 02/03: Symlink multiarch path to non-multiarch 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 d36c9110a6993b4845649a3aa992961b1a6b4426
Author: James Clarke <jrtc27 at jrtc27.com>
Date:   Fri Jan 6 19:02:11 2017 +0000

    Symlink multiarch path to non-multiarch path
    
    This is not ideal, since some users may already have updated their
    unstable chroots to 0.82, but unstable is unstable, and trying to make
    upgrades from 0.82 work would be a nightmare. Sorry for the breakage.
    
    Closes: #850453
---
 debian/control         | 1 +
 debian/cowdancer.links | 5 +++++
 debian/rules           | 5 +++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index d733d56..d0fcdf3 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.links b/debian/cowdancer.links
new file mode 100755
index 0000000..302bc91
--- /dev/null
+++ b/debian/cowdancer.links
@@ -0,0 +1,5 @@
+#!/usr/bin/dh-exec
+# Make the multiarch path a symlink to the non-multiarch path
+# Once stretch is released, this can be dropped and the library can be moved to
+# the multiarch path. See #850453.
+usr/lib/cowdancer usr/lib/${DEB_HOST_MULTIARCH}/cowdancer
diff --git a/debian/rules b/debian/rules
index 7968d72..7d104bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,8 +16,9 @@ endif
 %:
 	dh $@
 
-# Multiarch is not supported (and irrelevant), since libcowdancer is the only
-# shared library and is internal
+# Multiarch is supported, but to support upgrades, the library needs to stay in
+# the non-multiarch path for one release with a symlink from the multiarch
+# path. See #850453.
 override_dh_auto_configure:
 	dh_auto_configure -- --libdir='$${prefix}/lib' --libexecdir='$${prefix}/lib'
 

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