From dd30d527744e379a23602e2c32c680e4970d831a Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 16 Feb 2016 08:19:18 +0000 Subject: [PATCH] Redirect libexecdir to /usr/lib (not /usr/lib/${multiarch}) since we don't need multiarch for anything that's installed there, fixing a broken symlink in ostree-grub2 --- debian/changelog | 3 +++ debian/ostree-grub2.install | 2 +- debian/ostree-tests.install | 2 +- debian/rules | 9 +++++---- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5a6cbbc1..90e48c67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,9 @@ ostree (2016.1+deb-1) UNRELEASED; urgency=medium * ostree-grub2: recommend concrete GRUB packages instead of hard-depending on a transitional package. This is only a Recommends because you could be using some other architecture's grub packages. + * Redirect libexecdir to /usr/lib (not /usr/lib/${multiarch}) since we don't + need multiarch for anything that's installed there, fixing a broken + symlink in ostree-grub2 -- Simon McVittie Wed, 27 Jan 2016 13:04:34 +0100 diff --git a/debian/ostree-grub2.install b/debian/ostree-grub2.install index 95085efb..a4bcce25 100644 --- a/debian/ostree-grub2.install +++ b/debian/ostree-grub2.install @@ -1,2 +1,2 @@ etc/grub.d/15_ostree -usr/lib/*/ostree/grub2-15_ostree usr/lib/ostree/ +usr/lib/ostree/grub2-15_ostree diff --git a/debian/ostree-tests.install b/debian/ostree-tests.install index 2c3436b4..d536574a 100644 --- a/debian/ostree-tests.install +++ b/debian/ostree-tests.install @@ -1,2 +1,2 @@ -usr/lib/*/ostree/installed-tests +usr/lib/ostree/installed-tests usr/share/installed-tests/ostree diff --git a/debian/rules b/debian/rules index 1db06d84..3a197331 100755 --- a/debian/rules +++ b/debian/rules @@ -17,6 +17,7 @@ override_dh_auto_configure: --disable-silent-rules \ --enable-gtk-doc \ --enable-installed-tests \ + --libexecdir='$${prefix}/lib' \ --with-dracut \ --with-grub2 \ --with-systemdsystemunitdir=/lib/systemd/system \ @@ -25,14 +26,14 @@ override_dh_auto_configure: override_dh_install: rm -f debian/tmp/usr/lib/*/*.la - rm -f debian/tmp/usr/lib/*/ostree/installed-tests/*.la + rm -f debian/tmp/usr/lib/ostree/installed-tests/*.la dh_install --fail-missing override_dh_fixperms: dh_fixperms -X'*.js' - chmod -v +x debian/tmp/usr/lib/*/ostree/installed-tests/*.js - chmod -v +x debian/tmp/usr/lib/*/ostree/installed-tests/*.py - chmod -v +x debian/tmp/usr/lib/*/ostree/installed-tests/*.sh + chmod -v +x debian/tmp/usr/lib/ostree/installed-tests/*.js + chmod -v +x debian/tmp/usr/lib/ostree/installed-tests/*.py + chmod -v +x debian/tmp/usr/lib/ostree/installed-tests/*.sh override_dh_systemd_start: dh_systemd_start --no-start