let dh_bugfiles take care of the bugscript instead of handcopying

diff --git a/debian/apt.bug-script b/debian/apt.bug-script
new file mode 100755 (executable)
index 0000000..f5ec9e0
--- /dev/null
+++ b/debian/apt.bug-script
@@ -0,0 +1,33 @@
+#!/bin/bash -e
+
+# reportbug #169495
+if [ -z "$YESNO" ]; then
+  YESNO=$"yYnN"
+fi
+
+cat <<EOF
+I can automatically include various information about your apt configuration in
+your bug report.  This information may help to diagnose your problem.
+
+EOF
+
+yesno "May I include your apt configuration (/etc/apt/apt.conf et al)? [Y/n] " yep
+
+if [ "$REPLY" = "yep" ]; then
+  echo -e "\n-- apt-config dump --\n" >&3
+  apt-config dump >&3 2>&1
+fi
+
+for config in /etc/apt/preferences /etc/apt/sources.list; do
+  if [ -f $config ]; then
+    yesno "May I include your $config configuration file? [Y/n] " yep
+    if [ "$REPLY" = "yep" ]; then
+      echo -e "\n-- $config --\n" >&3
+      cat $config >&3
+    else
+      echo -e "\n-- ($config present, but not submitted) --\n" >&3
+    fi
+  else
+    echo -e "\n-- (no $config present) --\n" >&3
+  fi
+done

diff --git a/debian/bugscript b/debian/bugscript
deleted file mode 100755 (executable)
index f5ec9e0..0000000
--- a/debian/bugscript
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash -e
-
-# reportbug #169495
-if [ -z "$YESNO" ]; then
-  YESNO=$"yYnN"
-fi
-
-cat <<EOF
-I can automatically include various information about your apt configuration in
-your bug report.  This information may help to diagnose your problem.
-
-EOF
-
-yesno "May I include your apt configuration (/etc/apt/apt.conf et al)? [Y/n] " yep
-
-if [ "$REPLY" = "yep" ]; then
-  echo -e "\n-- apt-config dump --\n" >&3
-  apt-config dump >&3 2>&1
-fi
-
-for config in /etc/apt/preferences /etc/apt/sources.list; do
-  if [ -f $config ]; then
-    yesno "May I include your $config configuration file? [Y/n] " yep
-    if [ "$REPLY" = "yep" ]; then
-      echo -e "\n-- $config --\n" >&3
-      cat $config >&3
-    else
-      echo -e "\n-- ($config present, but not submitted) --\n" >&3
-    fi
-  else
-    echo -e "\n-- (no $config present) --\n" >&3
-  fi
-done

diff --git a/debian/rules b/debian/rules
index 1c5b6d51575576df6e27fe2bee71d221eb7221ff..5331bea804e8e93c4dca03170171a6dcc618b425 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -188,7 +188,6 @@ apt: build build-doc
        cp $(BLD)/scripts/dselect/* debian/$@/usr/lib/dpkg/methods/apt/
        cp -r $(BLD)/locale debian/$@/usr/share/
 
-       cp debian/bugscript debian/$@/usr/share/bug/apt/script
        cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt
 
        cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
@@ -202,6 +201,7 @@ apt: build build-doc
        #mv debian/$@/usr/bin/apt-report-mirror-failure \
        #   debian/$@/usr/lib/apt/apt-report-mirror-failure \
 
+       dh_bugfiles -p$@
        dh_lintian -p$@
        dh_installexamples -p$@ $(BLD)/docs/examples/*
        dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES)))