Control: merge -1 806235
Control: tags -1 +patch
On 2015-11-25 18:03 +0100, Jakub Wilk wrote:
> Package: apt-xapian-index
> Version: 0.47+nmu1
> User: debian...@lists.debian.org
> Usertags: adequate obsolete-conffile
>
> The package left obsolete conffile after upgrade:
> /etc/bash_completion.d/axi-cache
I had just noticed that myself, but you beat me to it. :-)
Perhaps some mass-bug filing would be in order here, since this issue
affects each and every package which used dh_bash-completion in Jessie. :-/
On my system I found four other obsolete conffiles in
/etc/bash_completion.d/.
> Please consult https://wiki.debian.org/DpkgConffileHandling for
> instructions on how to remove conffiles properly.
I had started to write a maintscript file for dh_installdeb, but since
the package already uses manually inserted calls to
dpkg-maintscript-helper, I copied and pasted the generated calls below
those instead. See the first attached patch.
The bash-completion build dependency should probably be bumped to a
version that does not suffer from #668254, since building with an older
bash-completion would likely have some undesired effects. I have done
that in a second patch.
Cheers,
Sven
>From 30aaa83ef7a566b947705f12ed8fc293657b8deb Mon Sep 17 00:00:00 2001
From: Sven Joachim
Date: Wed, 25 Nov 2015 19:07:44 +0100
Subject: [PATCH 1/2] Remove /etc/bash_completion.d/axi-cache on upgrades
---
debian/changelog | 7 +++
debian/postinst | 1 +
debian/postrm| 1 +
debian/preinst | 1 +
4 files changed, 10 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 5a10735..f34753d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt-xapian-index (0.47+nmu2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Remove /etc/bash_completion.d/axi-cache on upgrades. Closes: #806234
+
+ -- Sven Joachim Wed, 25 Nov 2015 19:07:27 +0100
+
apt-xapian-index (0.47+nmu1) unstable; urgency=medium
* Non-maintainer upload.
diff --git a/debian/postinst b/debian/postinst
index 616f42d..f201803 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -12,6 +12,7 @@ else
fi
dpkg-maintscript-helper rm_conffile /etc/dbus-1/system.d/org.debian.AptXapianIndex.conf 0.46 apt-xapian-index -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/bash_completion.d/axi-cache 0.47+nmu2~ apt-xapian-index -- "$@"
case "$1" in
configure)
diff --git a/debian/postrm b/debian/postrm
index 542cecc..9d2fa98 100755
--- a/debian/postrm
+++ b/debian/postrm
@@ -3,6 +3,7 @@
set -e
dpkg-maintscript-helper rm_conffile /etc/dbus-1/system.d/org.debian.AptXapianIndex.conf 0.46 apt-xapian-index -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/bash_completion.d/axi-cache 0.47+nmu2~ apt-xapian-index -- "$@"
if [ "$1" = "remove" -o "$1" = "purge" ]; then
echo "Removing index /var/lib/apt-xapian-index..."
diff --git a/debian/preinst b/debian/preinst
index 57eeccb..c29c4f2 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -3,5 +3,6 @@
#DEBHELPER#
dpkg-maintscript-helper rm_conffile /etc/dbus-1/system.d/org.debian.AptXapianIndex.conf 0.46 apt-xapian-index -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/bash_completion.d/axi-cache 0.47+nmu2~ apt-xapian-index -- "$@"
exit 0
--
2.6.2
>From ad1f47c3f2391914028d9ced03e68ba2da95bb9e Mon Sep 17 00:00:00 2001
From: Sven Joachim
Date: Wed, 25 Nov 2015 19:07:57 +0100
Subject: [PATCH 2/2] Bump bash-completion build dependency to 1:2.1-4.2~
Building the package with an older bash-completion version would
reintroduce the conffile which is highly undesirable.
---
debian/changelog | 1 +
debian/control | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index f34753d..5654b91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ apt-xapian-index (0.47+nmu2) unstable; urgency=medium
* Non-maintainer upload.
* Remove /etc/bash_completion.d/axi-cache on upgrades. Closes: #806234
+ * Bump bash-completion build dependency to 1:2.1-4.2~ (see #668254).
-- Sven Joachim Wed, 25 Nov 2015 19:07:27 +0100
diff --git a/debian/control b/debian/control
index d471c3f..341345c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Enrico Zini
Uploaders: David Paleino
Build-Depends: debhelper (>= 7.0.50~)
Build-Depends-Indep: help2man, python (>= 2.6.6-3~), dh-python,
- bash-completion (>= 1:1.0-1~),
+ bash-completion (>= 1:2.1-4.2~),
python-xapian (>= 1.0.2),
python-apt (>= 0.7.93.2),
python-debian (>= 0.1.14),
--
2.6.2