4 files changed, 29 insertions, 25 deletions
diff --git a/debian/changelog b/debian/changelog
index 6632076..4ecd830 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,21 @@
 sitesummary (0.0.4) UNRELEASED; urgency=low
 
+  [ Petter Reinholdtsen ]
   * Reduce code duplication in SiteSummary.pm.  Add new function
     get_sitegroup().
   * Extend site-summary script to also entries per sitegroup within a
     site.
 
+  [ Steffen Joeris ]
+  * Add cdbs to build-depends
+  * Change build-depends-indep to build-depends as programs are needed
+    for the clean target
+  * Clean up control file and fix Recommends to make sure lintian is
+    happy
+  * Make sure that we use debhelper level 5 to avoid the creation of
+    a bad maintainer script (see #337664 for more information)
+  * Update debconf templates to fix a lintian warning
+
  -- Petter Reinholdtsen <pere@debian.org>  Sun, 27 Aug 2006 22:13:06 +0200
 
 sitesummary (0.0.3) terra; urgency=low
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 0f05eaf..1666e9b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: optional
 Maintainer: Debian Edu Developers <debian-edu@lists.debian.org>
 Uploaders: Petter Reinholdtsen <pere@debian.org>
-Build-Depends-Indep: debhelper (>= 4)
+Build-Depends: debhelper (>= 5), cdbs
 Standards-Version: 3.7.2
 
 Package: sitesummary
@@ -16,8 +16,7 @@ Description: Generate site summary of submitting hosts, server package
 Package: sitesummary-client
 Architecture: all
 Depends: ${misc:Depends}, wget, gnupg
-Recommends: dmidecide, pciutils
-Recommends: sitesummary
+Recommends: dmidecide, pciutils, sitesummary
 Description: Generate site summary of submitting hosts, client package
  Nice client.
 
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 252ce4f..1a72b32 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -1,22 +1,14 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-27 12:28+0200\n"
+"Report-Msgid-Bugs-To: debian-edu@lists.debian.org\n"
+"POT-Creation-Date: 2006-08-28 13:19+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,24 +18,26 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../sitesummary-client.templates:3
-msgid "URL to sitesummary collector"
+#: ../sitesummary-client.templates:1001
+msgid "URL?"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../sitesummary-client.templates:3
-msgid "Where should the sitesummary information be submitted"
+#: ../sitesummary-client.templates:1001
+msgid ""
+"Insert the URL to the sitesummary collector, where should the sitesummary "
+"information be submitted.  Several URLs can be specified separated by space."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../sitesummary-client.templates:8
-msgid "Site string"
+#: ../sitesummary-client.templates:2001
+msgid "Site?"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../sitesummary-client.templates:8
+#: ../sitesummary-client.templates:2001
 msgid "Insert a string identifying the site where this machine is located."
 msgstr ""