- Add bug script for collecting configuration info (Clo...

Author: mdz
Date: 2003-07-21 06:09:12 GMT
- Add bug script for collecting configuration info (Closes: #176482)

diff --git a/debian/bugscript b/debian/bugscript
new file mode 100755 (executable)
index 0000000..d7b58c6
--- /dev/null
+++ b/debian/bugscript
@@ -0,0 +1,37 @@
+#!/bin/sh -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)? [Y/n] " yep
+
+if [ "$REPLY" = "yep" ]; then
+  echo -e "\n-- apt-config dump --\n" >&3
+  apt-config dump >&3 2>&1
+fi
+
+if [ -f /etc/apt/preferences ]; then
+  yesno "May I include your apt preferences (/etc/apt/preferences)? [Y/n] " yep
+
+  if [ "$REPLY" = "yep" ]; then
+    echo -e "\n-- /etc/apt/preferences --\n" >&3
+    cat /etc/apt/preferences >&3
+  fi
+fi
+
+if [ -f /etc/apt/sources.list ]; then
+  yesno "May I include your sources.list (/etc/apt/sources.list)? [Y/n] " yep
+
+  if [ "$REPLY" = "yep" ]; then
+    echo -e "\n-- /etc/apt/sources.list --\n"
+    cat /etc/apt/sources.list >&3
+  fi
+fi

diff --git a/debian/changelog b/debian/changelog
index 384a127c0e5a239df4bf4fb582cf2a1166c88a19..ed56c1fce9d19504d83c1cf1d311d7149df84dcc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,8 +32,9 @@ apt (0.5.6) unstable; urgency=low
       (Closes: #193336)
     - Fix SGML validation errors in apt-cache.8.sgml introduced in 0.5.5 or so
     - Add a simple example to apt-ftparchive(1) (Closes: #95257)
       (Closes: #193336)
     - Fix SGML validation errors in apt-cache.8.sgml introduced in 0.5.5 or so
     - Add a simple example to apt-ftparchive(1) (Closes: #95257)

+    - Add bug script for collecting configuration info (Closes: #176482)

 
 

- -- Matt Zimmerman <mdz@debian.org>  Mon, 21 Jul 2003 01:53:07 -0400
+ -- Matt Zimmerman <mdz@debian.org>  Mon, 21 Jul 2003 01:59:43 -0400

 
 apt (0.5.5.1) unstable; urgency=low
 
 
 apt (0.5.5.1) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 144189189c7c8c14b3463b7e5614fe7daf3c10a2..3ec524cc6fa4e2dd64f8ebc64efe885b77469e55 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 # Made with the aid of dh_make, by Craig Small
 # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 # Some lines taken from debmake, by Christoph Lameter.
 # Made with the aid of dh_make, by Craig Small
 # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 # Some lines taken from debmake, by Christoph Lameter.

-# $Id: rules,v 1.49 2003/04/27 06:20:40 doogie Exp $
+# $Id: rules,v 1.50 2003/07/21 06:09:12 mdz Exp $

 
 # LD_LIBRARY_PATH=pwd/debian/apt/usr/lib dh_shlibdeps -papt
 # dpkg: /home/jgg/work/apt2/debian/apt/usr/lib/libapt-pkg.so.2.9 not found.
 
 # LD_LIBRARY_PATH=pwd/debian/apt/usr/lib dh_shlibdeps -papt
 # dpkg: /home/jgg/work/apt2/debian/apt/usr/lib/libapt-pkg.so.2.9 not found.


@@ -190,7 +190,7 @@ apt: build debian/shlibs.local
        dh_testdir -p$@
        dh_testroot -p$@
        dh_clean -p$@ -k
        dh_testdir -p$@
        dh_testroot -p$@
        dh_clean -p$@ -k

-       dh_installdirs -p$@ /usr/share
+       dh_installdirs -p$@ /usr/share/bug/$@

 #
 # apt install
 #
 #
 # apt install
 #


@@ -208,6 +208,8 @@ apt: build debian/shlibs.local
        cp $(BLD)/scripts/dselect/* debian/apt/usr/lib/dpkg/methods/apt/
        cp -r $(BLD)/locale debian/apt/usr/share/
 
        cp $(BLD)/scripts/dselect/* debian/apt/usr/lib/dpkg/methods/apt/
        cp -r $(BLD)/locale debian/apt/usr/share/
 

+       cp debian/bugscript debian/apt/usr/share/bug/apt/script
+

 #      head -n 500 ChangeLog > debian/ChangeLog
 
        dh_installexamples -p$@ $(BLD)/docs/examples/*
 #      head -n 500 ChangeLog > debian/ChangeLog
 
        dh_installexamples -p$@ $(BLD)/docs/examples/*