Control: tags -1 + patch
On Thu, 08 Nov 2018 at 14:19:04 +0000, Vivek Das Mohapatra wrote:
> Using this locally to explicitly set the interpreter for shell scripts
> to the canonical /bin/bash path.
I've sent a pull request to:
https://salsa.debian.org/debian/quilt/merge_requests/1
(or see attached).
smcv
>From 8e41a415d6b9f7eb8d1f8c3efb6b0533b71b9ad6 Mon Sep 17 00:00:00 2001
From: Vivek Das Mohapatra <vi...@collabora.com>
Date: Thu, 8 Nov 2018 14:19:04 +0000
Subject: [PATCH] Configure canonical /bin/bash path
This means that quilt binary packages built in a merged-/usr environment
continue to work on non-merged-/usr systems.
Closes: #913226
Reviewed-by: Simon McVittie <s...@collabora.com>
---
debian/changelog | 6 ++++++
debian/rules | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 4f788b8..5f3a6d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
quilt (0.65-3) UNRELEASED; urgency=medium
+ [ Ondřej Nový ]
* d/control: Remove Testsuite field, not needed anymore
+ [ Vivek Das Mohapatra ]
+ * Configure canonical /bin/bash path so that quilt binary packages
+ built in a merged-/usr environment continue to work on
+ non-merged-/usr systems (Closes: #913226)
+
-- Ondřej Nový <on...@debian.org> Mon, 01 Oct 2018 09:48:55 +0200
quilt (0.65-2) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index b124e8a..2a5aabb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ override_dh_auto_clean:
for po in po/*.backup; do test ! -e $$po || mv $$po $${po%%.backup}; done
override_dh_auto_configure:
- dh_auto_configure -- --with-docdir=/usr/share/doc/quilt --with-sendmail=/usr/sbin/sendmail --with-awk=/usr/bin/awk
+ dh_auto_configure -- --with-docdir=/usr/share/doc/quilt --with-sendmail=/usr/sbin/sendmail --with-awk=/usr/bin/awk --with-bash=/bin/bash
override_dh_auto_build:
# Backup a pristine copy of l10n files
--
2.19.1
