Merge rra@debian.org--lenny/debian-policy--devel--3.7

Merge changes from rra@debian.org--lenny/debian-policy--devel--3.7
(at http://archives.eyrie.org/software/arch/).

git-archimport-id: debian-policy@lists.debian.org--lenny/debian-policy--devel--3.7--patch-3

diff --git a/debconf-spec.desc b/debconf-spec.desc
index c021766e4fe9a9a959cb521d45cc1be8a0b20438..098f503a51626826fe3b229c44c943c0b67084c5 100644 (file)
--- a/debconf-spec.desc
+++ b/debconf-spec.desc
@@ -6,9 +6,6 @@ Abstract: This manual describes the package configuration system used
  config files which are used.
 Section: Debian
 
-Format: docbook-xml
-Files: /usr/share/doc/debian-policy/debconf_specification.xml.tar.gz
-
 Format: text
 Files: /usr/share/doc/debian-policy/debconf_specification.txt.gz
 

diff --git a/debian/changelog b/debian/changelog
index 56afc21628b120085c66121115a0248b519e3420..c49c4e924cc86dff85c5bd8ceef0452ae63851fa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,9 +35,12 @@ debian-policy (3.7.3.0) unstable; urgency=low
   * Bug fix: "Virtual package for Japanese font packages
     (ttf-japanese-mincho and ttf-japanese-gothic)", thanks to Nobuhiro
     Iwamatsu                                                 (Closes: #440931).
+  * Drop unsupported docbook-xml format from the doc-base file for the
+    debconf specification.
   * Remove inactive uploaders and add Russ Allbery.
+  * Update Standards-Version to 3.7.3 (no changes required).
   
- -- Russ Allbery <rra@debian.org>  Sun, 02 Dec 2007 21:19:09 -0800
+ -- Russ Allbery <rra@debian.org>  Sun, 02 Dec 2007 22:33:55 -0800
 
 debian-policy (3.7.2.2) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 5a82a9c4c541975d57e3508427ba666040aa77bf..4c1902232d475ee9e8ff99c145a4ea73a32a067d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: doc
 Priority: optional
 Maintainer: Debian Policy List <debian-policy@lists.debian.org>
 Uploaders: Manoj Srivastava <srivasta@debian.org>, Russ Allbery <rra@debian.org>
-Standards-Version: 3.6.2.2
+Standards-Version: 3.7.3
 Build-Depends-Indep: sgml-data (>= 2.0), debiandoc-sgml (>= 1.1.47), tetex-extra, groff, bsdmainutils, pstoedit, jade, docbook-xml (>= 3.1.1), docbook-dsssl, tidy, links (>= 0.90) | elinks
 
 Package: debian-policy

diff --git a/debian/rules b/debian/rules
index e19494e664692e2eb7a6c84da8452c076bb4cd7d..04cf38e350ec0fda7c821ce247f50e7bc02a30cf 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -150,7 +150,7 @@ stamp-policy:  build $(sanitycheck)
        $(install_file)     debian/changelog         $(DOCDIR)/
        # Be more specific with file compression
        gzip -f9            $(DOCDIR)/*.txt $(DOCDIR)/*.sgml \
-                               $(DOCDIR)/fhs/* $(DOCDIR)/changelog
+                               $(DOCDIR)/changelog
 # These are allready compressed
        #$(install_file)    $(FHS_NEW_FILES)         $(DOCDIR)/fhs/
        $(install_file)     $(FHS_FILES)             $(DOCDIR)/fhs/

diff --git a/upgrading-checklist.html b/upgrading-checklist.html
index 1c9e8369e8f02addfba395aca9e45427b7bf7d64..65fd16a4f1cb9d4fc7c20b8425a6152072878222 100644 (file)
--- a/upgrading-checklist.html
+++ b/upgrading-checklist.html
@@ -53,7 +53,7 @@ picking your way through this list.
 <h2>The checklist</h2>
 
 <pre>
-3.7.3.0                        unreleased
+3.7.3.0                        Dec 2007
      * Package version numbers may contain tildes, which sort before
        anything, even the end of a part.                         [5.6.12]
      * Scripts may assume that /bin/sh supports local (at a basic level)