diff -Nru ubuntu-policy-3.8.1.0ubuntu1/debian/changelog ubuntu-policy-3.8.2.0ubuntu1/debian/changelog --- ubuntu-policy-3.8.1.0ubuntu1/debian/changelog 2009-04-27 20:30:51.000000000 +0100 +++ ubuntu-policy-3.8.2.0ubuntu1/debian/changelog 2009-06-19 15:04:51.000000000 +0100 @@ -1,3 +1,82 @@ +ubuntu-policy (3.8.2.0ubuntu1) karmic; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Rebrand as "Ubuntu Policy Manual", preserving acknowledgements. + - Document Ubuntu Maintainer field handling. + - The Breaks field may safely be used in Ubuntu packages. + - Document requirement to update the icon cache when installing files + into subdirectories of /usr/share/icons. + - Document the layout of the Ubuntu archive. + - Describe Ubuntu version number conventions. + - Document the changelog conventions for closing bugs in Launchpad, and + the Launchpad-Bugs-Fixed .changes field. + - Recommend that Standards-Version not be adjusted for Ubuntu revisions + of this manual, and in general that Standards-Version should not be + changed in Ubuntu for packages originating in Debian. + - Recommend discussion on ubuntu-devel rather than debian-devel. + - Document the special semantics of packages in the "metapackages" + section. See: + https://lists.ubuntu.com/archives/ubuntu-devel/2008-September/026523.html + - Note that Maintainer field changes for Ubuntu do not generally need to + be documented in debian/changelog. + + -- Colin Watson Fri, 19 Jun 2009 15:04:49 +0100 + +debian-policy (3.8.2.0) unstable; urgency=low + + [ Russ Allbery ] + * Policy: Mandate debconf or equivalent for user prompting + Wording: Andrew McMillan + Seconded: Russ Allbery + Seconded: Holger Levsen + Seconded: Bill Allombert + Seconded: Julien Cristau + Closes: #206684 + * Policy: Remove /etc/X11/XF86Config-4 FHS exception + Wording: Julien Cristau + Seconded: Russ Allbery + Seconded: Bill Allombert + Closes: #522219 + * Policy: Remove obsolete /var/mail transition requirement + Wording: Russ Allbery + Seconded: Julien Cristau + Seconded: Andrew McMillan + Closes: #522364 + * Policy: Move Speedo fonts into the deprecated category + Wording: Julien Cristau + Seconded: Russ Allbery + Seconded: Julien Danjou + Closes: #522218 + * Housekeeping (resynchronizing lists maintained elsewhere): + - Add GFDL 1.3 to the common-licenses list. + - Update the list of archive sections. (Closes: #519835) + * Set the release date of the 3.8.1 upgrading-checklist entry. + (Closes: #519706) + + [ Colin Watson ] + * The FHS is the "Filesystem Hierarchy Standard", regardless of our + preferred spelling of "file system" elsewhere. Fix this and a nearby + 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 + Seconded: Russ Allbery + Seconded: Julien Cristau + Closes: #525151 + * Add myself to Uploaders. + + [ 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 Tue, 16 Jun 2009 21:42:53 +0200 + ubuntu-policy (3.8.1.0ubuntu1) karmic; urgency=low * Resynchronise with Debian. Remaining changes: diff -Nru /tmp/oUI8QSgRpk/ubuntu-policy-3.8.1.0ubuntu1/debian/control /tmp/d0M3w66dzt/ubuntu-policy-3.8.2.0ubuntu1/debian/control --- ubuntu-policy-3.8.1.0ubuntu1/debian/control 2009-04-27 18:02:11.000000000 +0100 +++ ubuntu-policy-3.8.2.0ubuntu1/debian/control 2009-06-19 14:53:27.000000000 +0100 @@ -3,9 +3,9 @@ Priority: optional Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: Debian Policy List -Uploaders: Manoj Srivastava , Russ Allbery -Standards-Version: 3.8.0 -Build-Depends-Indep: sgml-data (>= 2.0), debiandoc-sgml (>= 1.1.47), texlive, groff, bsdmainutils, pstoedit, jade, docbook-xml (>= 3.1.1), docbook-dsssl, tidy, links (>= 0.90) | elinks +Uploaders: Manoj Srivastava , Russ Allbery , Colin Watson , Bill Allombert +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 XS-Debian-Vcs-Browser: http://git.debian.org/?p=dbnpolicy/policy.git XS-Debian-Vcs-Git: git://git.debian.org/git/dbnpolicy/policy.git Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/debian-policy/ubuntu diff -Nru /tmp/oUI8QSgRpk/ubuntu-policy-3.8.1.0ubuntu1/debian/rules /tmp/d0M3w66dzt/ubuntu-policy-3.8.2.0ubuntu1/debian/rules --- ubuntu-policy-3.8.1.0ubuntu1/debian/rules 2009-04-27 18:00:38.000000000 +0100 +++ ubuntu-policy-3.8.2.0ubuntu1/debian/rules 2009-06-19 14:52:37.000000000 +0100 @@ -14,7 +14,7 @@ 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 @@ $(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 -Nru /tmp/oUI8QSgRpk/ubuntu-policy-3.8.1.0ubuntu1/policy.sgml /tmp/d0M3w66dzt/ubuntu-policy-3.8.2.0ubuntu1/policy.sgml --- ubuntu-policy-3.8.1.0ubuntu1/policy.sgml 2009-04-27 20:01:50.000000000 +0100 +++ ubuntu-policy-3.8.2.0ubuntu1/policy.sgml 2009-06-19 14:54:28.000000000 +0100 @@ -776,18 +776,21 @@

The Ubuntu archive maintainers provide the authoritative list of sections. At present, they are: - admin, comm, - devel, doc, - editors, electronics, embedded, - games, gnome, graphics, - hamradio, interpreters, kde, - libs, libdevel, mail, - math, metapackages, misc, - net, news, oldlibs, - otherosfs, perl, python, - science, shells, - sound, tex, text, - utils, web, x11. + admin, cli-mono, comm, database, + devel, debug, doc, editors, + electronics, embedded, fonts, + games, gnome, graphics, gnu-r, + gnustep, hamradio, haskell, + httpd, interpreters, java, kde, + kernel, libs, libdevel, lisp, + localization, mail, math, + metapackages, misc, + net, news, ocaml, oldlibs, + otherosfs, perl, php, python, + ruby, science, shells, sound, + tex, text, utils, vcs, + video, web, x11, xfce, + zope.

@@ -1372,17 +1375,16 @@ Prompting in maintainer scripts

Package maintainer scripts may prompt the user if - necessary. Prompting should be done by communicating + necessary. Prompting must be done by communicating through a program, such as debconf, which conforms to the Debian Configuration Management - Specification, version 2 or higher. Prompting the user by - other means, such as by hand - From the Jargon file: by hand 2. By extension, - writing code which does something in an explicit or - low-level way for which a presupplied library - (debconf, in this instance) routine ought - to have been available. - , is now deprecated. + Specification, version 2 or higher. +

+ +

+ Packages which are essential, or which are dependencies of + essential packages, may fall back on another prompting method + if no such interface is available when they are executed.

@@ -2763,6 +2765,14 @@ package control file when the source package has the same name and version as the binary package.

+ +

+ Package names must consist only of lower case letters + (a-z), digits (0-9), plus (+) + and minus (-) signs, and periods (.). + They must be at least two characters long and must start + with an alphanumeric character. +

@@ -5735,11 +5745,11 @@ - File system Structure + File System Structure

The location of all installed files and directories must - comply with the File system Hierarchy Standard (FHS), + comply with the Filesystem Hierarchy Standard (FHS), version 2.3, with the exceptions noted below, and except where doing so would violate other terms of Ubuntu Policy. The following exceptions to the FHS apply: @@ -5747,13 +5757,6 @@

- Legacy XFree86 servers are permitted to retain the - configuration file location - /etc/X11/XF86Config-4. -

- - -

The optional rules related to user specific configuration files for applications are stored in the user's home directory are relaxed. It is @@ -5913,12 +5916,6 @@ by any particular mail agents. The use of the old location /var/spool/mail is deprecated, even though the spool may still be physically located there. - To maintain partial upgrade compatibility for systems - which have /var/spool/mail as their physical mail - spool, packages using /var/mail must depend on - either libc6 (>= 2.1.3-13), or on - base-files (>= 2.2.0), or on later - versions of either one of these packages.

@@ -8636,11 +8633,6 @@ - Speedo fonts must be placed in - /usr/share/fonts/X11/Speedo/. - - - Type 1 fonts must be placed in /usr/share/fonts/X11/Type1/. If font metric files are available, they must be placed here @@ -8651,9 +8643,9 @@ Subdirectories of /usr/share/fonts/X11/ other than those listed above must be neither created nor used. (The PEX, CID, - and cyrillic directories are excepted for - historical reasons, but installation of files into - these directories remains discouraged.) + Speedo, and cyrillic directories + are excepted for historical reasons, but installation of + files into these directories remains discouraged.) @@ -9277,8 +9269,8 @@

Packages distributed under the UCB BSD license, the Apache license (version 2.0), the Artistic license, the GNU GPL - (version 2 or 3), the GNU LGPL (versions 2, 2.1, or 3), and - the GNU FDL (version 1.2) should refer to the corresponding + (version 2 or 3), the GNU LGPL (versions 2, 2.1, or 3), and the + GNU FDL (versions 1.2 or 1.3) should refer to the corresponding files under /usr/share/common-licenses,

In particular, @@ -9289,8 +9281,9 @@ /usr/share/common-licenses/GPL-3, /usr/share/common-licenses/LGPL-2, /usr/share/common-licenses/LGPL-2.1, - /usr/share/common-licenses/LGPL-3, and - /usr/share/common-licenses/GFDL-1.2 + /usr/share/common-licenses/LGPL-3, + /usr/share/common-licenses/GFDL-1.2, and + /usr/share/common-licenses/GFDL-1.3 respectively.

rather than quoting them in the copyright diff -Nru /tmp/oUI8QSgRpk/ubuntu-policy-3.8.1.0ubuntu1/upgrading-checklist.html /tmp/d0M3w66dzt/ubuntu-policy-3.8.2.0ubuntu1/upgrading-checklist.html --- ubuntu-policy-3.8.1.0ubuntu1/upgrading-checklist.html 2009-04-27 18:00:38.000000000 +0100 +++ ubuntu-policy-3.8.2.0ubuntu1/upgrading-checklist.html 2009-06-19 14:52:37.000000000 +0100 @@ -41,7 +41,27 @@

The checklist

-3.8.1.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
+       for the list of new sections and rules for how to categorize
+       packages.                                                 [2.4]
+     * 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]
+     * 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
+       /var/mail.                                                [9.1.3]
+     * Speedo fonts are now deprecated.  The X backend was disabled
+       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
 
      * Care should be taken when adding functionality to essential and
        such additions create an obligation to support that functionality