* Remove conffiles, since debhelper installs them for us

 * Fix section of debbugs-perl
 * Don't bother to create directories
 * Modify the set of files that debbugs installs
 * Update copyright information slightly

diff --git a/debian/changelog b/debian/changelog
index 74ff9ae26325520d7347bd9e66a607f7cabd3600..3eddef12c577fec5427d5e6a7bfe64c4b3d9819e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debbugs (2.4.2) UNRELEASED; urgency=low
+debbugs (2.4.2~exp0) UNRELEASED; urgency=low
 
   [ Anthony Towns ]
   * Add "package" command to service (control@) to limit the bugs that

diff --git a/debian/conffiles b/debian/conffiles
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/debian/control b/debian/control
index ede6ed126da6afa90c61afc625051e32c351e6d6..786a0ef22285be91601da104b023f50c7130de17 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: Debbugs developers <debian-debbugs@lists.debian.org>
 Uploaders: Josip Rodin <joy-packages@debian.org>, Colin Watson <cjwatson@debian.org>, Don Armstrong <don@debian.org>
-Standards-Version: 3.2.1
+Standards-Version: 3.8.1
 Build-Depends-Indep: debhelper, libparams-validate-perl,
  libmailtools-perl, libmime-tools-perl, libio-stringy-perl, libmldbm-perl,
  liburi-perl, libsoap-lite-perl, libcgi-simple-perl,
@@ -34,6 +34,7 @@ Depends: ${perl:Depends}, libmailtools-perl, ed, libmime-tools-perl,
  libio-stringy-perl, libmldbm-perl, liburi-perl, libsoap-lite-perl,
  libcgi-simple-perl, libparams-validate-perl, libtext-template-perl,
  libsafe-hole-perl, libmail-rfc822-address-perl
+Section: perl
 Description: modules used by the active Debian BTS
  Debian has a bug tracking system which files details of bugs reported by
  users and developers. Each bug is given a number, and is kept on file until

diff --git a/debian/copyright b/debian/copyright
index 63a77c9207bd16f64b600ffb8281544a290d5e02..7ba75071af081e76353ab644102d1e09d5b0cf89 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -29,10 +29,12 @@ useful, but without any warranty; without even the implied warranty of
 merchantability or fitness for a particular purpose. See the GNU General
 Public License for more details.
 
-You should have received a copy of the GNU General Public License along
-with this program, or one should be available above; if not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 On Debian systems, the full text of the GPL can be found in
-/usr/share/common-licenses/GPL.
+/usr/share/common-licenses/GPL-2.
+
+
+Portions of the bug system copyrighted by Don Armstrong are available
+under the terms of the GPL version 2 or later, at your option.
\ No newline at end of file

diff --git a/debian/debbugs-web.conffiles b/debian/debbugs-web.conffiles
deleted file mode 100644 (file)
index e3ce09b..0000000
--- a/debian/debbugs-web.conffiles
+++ /dev/null
@@ -1,7 +0,0 @@
-/etc/debbugs/html/Access.html.in
-/etc/debbugs/html/Developer.html.in
-/etc/debbugs/html/Reporting.html.in
-/etc/debbugs/html/index.html.in
-/etc/debbugs/html/server-control.html.in
-/etc/debbugs/html/server-refcard.html.in
-/etc/debbugs/html/server-request.html.in

diff --git a/debian/debbugs.install b/debian/debbugs.install
index 3e0bcd87479df35a46a313f469b1b4be4e818dc6..81d29cbef0bd5d574b7bd141b26188693ceb9520 100644 (file)
--- a/debian/debbugs.install
+++ b/debian/debbugs.install
@@ -2,6 +2,7 @@ usr/lib/debbugs
 usr/share/man/man8
 usr/sbin
 usr/share/doc/debbugs/examples
-var/lib/debbugs
+var/lib/debbugs/spool
+var/lib/debbugs/indices
 usr/bin/add_bug_to_estraier
 usr/share/man/man1/add_bug_*

diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644 (file)
index bfac206..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,13 +0,0 @@
-etc/debbugs/html
-etc/debbugs/indices
-usr/lib/debbugs
-usr/sbin
-usr/share/doc/debbugs/examples
-var/lib/debbugs/indices
-var/lib/debbugs/www/cgi
-var/lib/debbugs/www/db
-var/lib/debbugs/www/txt
-var/lib/debbugs/spool/lock
-var/lib/debbugs/spool/archive
-var/lib/debbugs/spool/incoming
-var/lib/debbugs/spool/db-h

diff --git a/debian/postinst b/debian/postinst
deleted file mode 100755 (executable)
index 10dddc6..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh -e
-
-# Temporarily disable the postinst for now
-# if [ "$1" = "configure" ]; then
-#   /usr/sbin/debbugsconfig
-#   if dpkg --compare-versions "$2" lt 2.4; then
-#     spool=`perl -e 'require "/etc/debbugs/config"; print $gSpoolDir;'`
-#     if [ -d "$spool/db" ]; then
-#       if [ -d "$spool/db-h" ]; then
-#         echo "Cannot migrate bug database to hashed format, because" >&2
-#         echo "$spool/db-h already exists." >&2
-#         echo "Rectify the situation and run the following command by hand:" >&2
-#         echo "  /usr/sbin/debbugs-dbhash \"$spool/db\" \"$spool/db-h\"" >&2
-#       else
-#         echo "Migrating bug database to hashed format." >&2
-#         /usr/sbin/debbugs-dbhash "$spool/db" "$spool/db-h"
-#         echo "You can remove bug logs from $spool/db" >&2
-#         echo "after ensuring that the new database works." >&2
-#       fi
-#     fi
-#   fi
-# fi
-# 
-# if [ -f /etc/debbugs/nextnumber ]; then
-#   rm -f /etc/debbugs/nextnumber
-# fi
-
-#DEBHELPER#

diff --git a/debian/postrm b/debian/postrm
deleted file mode 100644 (file)
index 40d32b9..0000000
--- a/debian/postrm
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "purge" ]; then
-  rm -rf /etc/debbugs /var/lib/debbugs
-fi
-
-#DEBHELPER#

diff --git a/debian/rules b/debian/rules
index 4c751ff88cefe09c876f76273605e0f1478c0c27..7d6f7d68acae293781990f5d826aa0912f6ea3a2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,7 @@ binary-indep: build install
        dh_installdirs
        $(MAKE) install_mostfiles DESTDIR=$(DEST_DIR)
        $(MAKE) -f Makefile.perl install PREFIX=$(DEST_DIR)/usr
-       dh_install --sourcedir=debian/tmp --list-missing
+       dh_install --sourcedir=debian/tmp --fail-missing
        dh_installdocs
        dh_installchangelogs
        dh_strip