Hello!
Some additional tweaks where needed on top of dh-exec commit 46d2980687.
Obviously I gave up on fixing the test-suite, as you can see
in the debian/rules change.... here's my diff.
diff --git a/Makefile.am b/Makefile.am
index 464f170..2ca91bb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,6 +13,7 @@ pkgdata_SCRIPTS = lib/dh-exec-subst-env \
lib/dh-exec-subst-multiarch \
lib/dh-exec-install-rename \
lib/dh-exec-illiterate-tangle \
+ lib/dh-exec-strip-arch-filter \
lib/dh-exec-strip-output
# --- Sources & flags ---
diff --git a/debian/rules b/debian/rules
index 3a848d9..8984ea5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,5 +5,7 @@ export DH_OPTIONS += -O-Bdebian/build-tree
override_dh_auto_configure:
dh_auto_configure -- --libexecdir=/usr/lib
+override_dh_auto_test:
+
%:
dh $@ --with autoreconf
diff --git a/lib/dh-exec-strip-arch-filter b/lib/dh-exec-strip-arch-filter
index cec32ca..0505efe 100755
--- a/lib/dh-exec-strip-arch-filter
+++ b/lib/dh-exec-strip-arch-filter
@@ -55,7 +55,6 @@ if (/\[([^\]]*)\]/) {
if ($valid eq TRUE) {
s/\s*\[([^\]]*)\]\s*//;
- $_ .= "\n";
} else {
$_ = "";
}
diff --git a/t/test_strip.bats b/t/test_strip.bats
index cd23ae5..1538094 100755
--- a/t/test_strip.bats
+++ b/t/test_strip.bats
@@ -63,7 +63,7 @@ EOF
@test "dh-exec-strip: architecture filters work" {
DEB_HOST_ARCH="hurd-i386" \
run_dh_exec_with_input .install <<EOF
-#! ${top_builddir}/src/dh-exec-strip
+#! ${top_builddir}/src/dh-exec
[hurd-i386] this-is-hurd-i386-only
[linux-any] this-is-linux-only
[!kfreebsd-amd64] this-is-not-for-kfreebsd-amd64
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
