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

@@ -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 <smcv@debian.org>  Wed, 27 Jan 2016 13:04:34 +0100
 

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

debian/ostree-tests.install

@@ -1,2 +1,2 @@
-usr/lib/*/ostree/installed-tests
+usr/lib/ostree/installed-tests
 usr/share/installed-tests/ostree

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