[Bash-completion-commits] [SCM] debian-package branch, master, updated. debian/1.3-1-32-g653f34e

[David Paleino]

The following commit has been merged in the master branch:
commit 4bfa85b495bff991ee9d142f7584b2a1b198c344
Author: David Paleino <dapal at debian.org>
Date:   Mon Apr 11 11:50:14 2011 +0200

    Re-implement triggers

diff --git a/debian/changelog b/debian/changelog
index 535d4c8..2778f89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ bash-completion (1:1.3-2) UNRELEASED; urgency=low
 
   * Change completion directory layout (00-change_completions_layout.patch)
   * Use autoreconf in debian/rules
-  * Implement APT hook and update-bash-completion script, and monthly
+  * Implement dpkg triggers and update-bash-completion script, and monthly
     cronjob to clean up unused completions.
   * Remove old UCF-related postinst tasks
   * Remove old conffiles, using dpkg-maintscript-helper
@@ -11,7 +11,7 @@ bash-completion (1:1.3-2) UNRELEASED; urgency=low
   * Added debian/README.Debian with instructions on the new layout,
     and how to enable completions
 
- -- David Paleino <dapal at debian.org>  Sun, 10 Apr 2011 15:42:08 +0200
+ -- David Paleino <dapal at debian.org>  Mon, 11 Apr 2011 11:49:44 +0200
 
 bash-completion (1:1.3-1) unstable; urgency=low
 
diff --git a/debian/extra/apt-hook/99-bash-completion b/debian/extra/apt-hook/99-bash-completion
deleted file mode 100644
index af62a63..0000000
--- a/debian/extra/apt-hook/99-bash-completion
+++ /dev/null
@@ -1,6 +0,0 @@
-// Activate bash-completions
-
-DPkg
-{
-	Post-Invoke {"if [ -x /usr/sbin/update-bash-completion ]; then /usr/sbin/update-bash-completion; else exit 0; fi";};
-};
diff --git a/debian/install b/debian/install
index c5cf3c4..f73bb40 100644
--- a/debian/install
+++ b/debian/install
@@ -4,4 +4,3 @@ debian/extra/debhelper/bash_completion.pm	/usr/share/perl5/Debian/Debhelper/Sequ
 debian/compdict	/usr/share/bash-completion/
 debian/extra/scripts/update-bash-completion	/usr/sbin/
 debian/extra/cron/bash-completion	/etc/cron.monthly/
-debian/extra/apt-hook/99-bash-completion		/etc/apt/apt.conf.d/
diff --git a/debian/postinst b/debian/postinst
index 91cea2c..433d43c 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -11,6 +11,11 @@ case "$1" in
 	;;
     abort-upgrade|abort-remove|abort-deconfigure)
 	;;
+	triggered)
+		if [ -x /usr/sbin/update-bash-completion ]; then
+			/usr/sbin/update-bash-completion
+		fi
+	;;
     *)
         echo "postinst called with unknown argument \`$1'" >&2
         exit 1
diff --git a/debian/triggers b/debian/triggers
new file mode 100644
index 0000000..0f8572d
--- /dev/null
+++ b/debian/triggers
@@ -0,0 +1,5 @@
+interest /usr/bin
+interest /usr/sbin
+interest /usr/games
+interest /bin
+interest /sbin

-- 
debian-package