Merge branch 'master' into bug530967-rra

diff --git a/debian/changelog b/debian/changelog
index 589f711f092c7b2263c28aa7a8f298461ae3426b..dce0eb9b5d3d451dcc6f2becb8b35536333909e7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-debian-policy (3.8.2.0) UNRELEASED; urgency=low
+debian-policy (3.8.2.1) UNRELEASED; urgency=low
+
+  * Breaks is now supported by the stable release of dpkg, so drop
+    warnings against its use.  Thanks, Steve Langasek.  (Closes: #533577)
+
+ -- Russ Allbery <rra@debian.org>  Thu, 18 Jun 2009 15:59:48 -0700
+
+debian-policy (3.8.2.0) unstable; urgency=low
 
   [ Russ Allbery ]
   * Policy: Mandate debconf or equivalent for user prompting
@@ -35,6 +42,7 @@ debian-policy (3.8.2.0) UNRELEASED; urgency=low
     search-and-replace capitalisation bug.
   * Build-depend on texlive-latex-extra, which is needed by
     debiandoc2latexps and isn't included in texlive's dependencies.
+    Closes: #533257
   * Policy: State requirements for source package names
     Wording: Colin Watson <cjwatson@debian.org>
     Seconded: Russ Allbery <rra@debian.org>
@@ -42,7 +50,15 @@ debian-policy (3.8.2.0) UNRELEASED; urgency=low
     Closes: #525151
   * Add myself to Uploaders.
 
- -- Russ Allbery <rra@debian.org>  Fri, 20 Mar 2009 14:45:46 -0700
+  [ Bill Allombert ]
+  * Add myself to Uploaders.
+  * Update Standards-Version to 3.8.1 (no changes required).
+  * debian/rules: 
+    - use `dpkg --print-architecture' instead of obsolete form 
+      `dpkg --print-installation-architecture'.
+    - fix a race condition while generating DEBIAN/md5sums.
+
+ -- Bill Allombert <ballombe@debian.org>  Tue, 16 Jun 2009 21:42:53 +0200
 
 debian-policy (3.8.1.0) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 247b0e72e11dcfdf5c3646c95c866d8bb5c394d8..1c75184bf240fa391765d1a18f657a37532c7d7a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: debian-policy
 Section: doc
 Priority: optional
 Maintainer: Debian Policy List <debian-policy@lists.debian.org>
-Uploaders: Manoj Srivastava <srivasta@debian.org>, Russ Allbery <rra@debian.org>, Colin Watson <cjwatson@debian.org>
-Standards-Version: 3.8.0
+Uploaders: Manoj Srivastava <srivasta@debian.org>, Russ Allbery <rra@debian.org>, Colin Watson <cjwatson@debian.org>, Bill Allombert <ballombe@debian.org>
+Standards-Version: 3.8.1
 Build-Depends-Indep: sgml-data (>= 2.0), debiandoc-sgml (>= 1.1.47), texlive, texlive-latex-extra, groff, bsdmainutils, pstoedit, jade, docbook-xml (>= 3.1.1), docbook-dsssl, tidy, links (>= 0.90) | elinks
 Vcs-Browser: http://git.debian.org/?p=dbnpolicy/policy.git
 Vcs-Git: git://git.debian.org/git/dbnpolicy/policy.git

diff --git a/debian/rules b/debian/rules
index f3f3b766176fa1aa9ec74c8963f060004fdf1bd5..4fa4518f6025ca9d00892df9815d627cd4435bfc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ export DEB_HOST_GNU_CPU    ?= $(shell dpkg-architecture $(ha) -qDEB_HOST_GNU_CPU
 export DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture $(ha) -qDEB_HOST_GNU_SYSTEM)
 export DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture $(ha) -qDEB_HOST_GNU_TYPE)
 
-arch   := $(shell dpkg --print-installation-architecture)
+arch   := $(shell dpkg --print-architecture)
 
 # Basic information
 package := $(shell grep Source debian/control | sed 's/^Source: //')
@@ -142,7 +142,8 @@ stamp-policy:  build $(sanitycheck)
        $(install_file)     $(FHS_HTML)   $(DOCDIR)/fhs
        @set -ex; \
        cd debian/tmp; \
-       find . -type f -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums
+       find . -path "./DEBIAN" -prune -o -type f -printf '%P\0' \
+           | xargs -r0 md5sum > DEBIAN/md5sums
        dpkg-gencontrol     -p$(package) -Pdebian/tmp -isp
        chown               -R root:root debian/tmp
        chmod               -R go=rX debian/tmp

diff --git a/policy.sgml b/policy.sgml
index 52e7e24aea4a153e83f0e3a1594a28cdc716407b..fd7755d34ade940ebf2565468cc07e755e66f2a4 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -4468,12 +4468,6 @@ Build-Depends: foo [!i386] | bar [!amd64]
       <sect id="breaks">
        <heading>Packages which break other packages - <tt>Breaks</tt></heading>
 
-       <p>
-         Using <tt>Breaks</tt> may cause problems for upgrades from older
-         versions of Debian and should not be used until the stable
-         release of Debian supports <tt>Breaks</tt>.
-       </p>
-
        <p>
          When one binary package declares that it breaks another,
          <prgn>dpkg</prgn> will refuse to allow the package which
@@ -4558,8 +4552,7 @@ Build-Depends: foo [!i386] | bar [!amd64]
          <prgn>dpkg</prgn> from upgrading or installing the package
          which declared such a conflict until the upgrade or removal
          of the conflicted-with package had been completed.  Instead,
-         <tt>Breaks</tt> may be used (once <tt>Breaks</tt> is supported
-         by the stable release of Debian).
+         <tt>Breaks</tt> may be used.
        </p>
       </sect>
 

diff --git a/upgrading-checklist.html b/upgrading-checklist.html
index c45189087a86a8306756fdcdf22cd771629c2144..fbf9b7c51d611766efdcf04b6753a147f7a4dc31 100644 (file)
--- a/upgrading-checklist.html
+++ b/upgrading-checklist.html
@@ -41,7 +41,7 @@ picking your way through this list.
 <h2>The checklist</h2>
 
 <pre>
-3.8.2.0                        unreleased
+3.8.2.0                        Jun 2009
 
      * The list of archive sections has been significantly expanded.  See
        http://lists.debian.org/debian-devel-announce/2009/03/msg00010.html
@@ -50,6 +50,8 @@ picking your way through this list.
      * All packages must use debconf or equivalent for user prompting,
        though essential packages or their dependencies may also fall
        back on other methods.                                    [3.9.1]
+     * The requirements for source package names are now explicitly
+       spelled out.                                              [5.6.1]
      * Legacy XFree86 servers no longer get a special exception from the
        FHS permitting /etc/X11/XF86Config-4.                     [9.1]
      * Removed obsolete dependency requirements for packages that use
@@ -58,8 +60,6 @@ picking your way through this list.
        starting in lenny.                                        [11.8.5]
      * The GNU Free Documentation License version 1.3 is included in
        common-licenses and should be referenced from there.      [12.5]
-     * The requirements for source package names are now explicitly
-       spelled out.                                              [5.6.1]
 
 3.8.1.0                        Mar 2009