From 6e1b2d9c86e05355da2081276decbf3ae3fce4c2 Mon Sep 17 00:00:00 2001 From: Manoj Srivastava Date: Sun, 23 Mar 2008 23:00:53 +0000 Subject: [PATCH] Sync with upstream Sync with upstream Patches applied: * debian-policy@lists.debian.org--lenny/debian-policy--devel--3.7--patch-2 Merge rra@debian.org--lenny/debian-policy--devel--3.7 * debian-policy@lists.debian.org--lenny/debian-policy--devel--3.7--patch-3 Merge rra@debian.org--lenny/debian-policy--devel--3.7 * debian-policy@lists.debian.org--lenny/debian-policy--devel--3.7--patch-4 Merge with rra@debian.org--lenny/debian-policy--devel--3.7 * rra@debian.org--lenny/debian-policy--breaks--3.7--base-0 tag of rra@debian.org--lenny/debian-policy--devel--3.7--patch-27 * rra@debian.org--lenny/debian-policy--breaks--3.7--patch-1 New Breaks dependency field * rra@debian.org--lenny/debian-policy--convenience--3.7--base-0 tag of rra@debian.org--lenny/debian-policy--devel--3.7--patch-27 * rra@debian.org--lenny/debian-policy--convenience--3.7--patch-1 Debian packages should not use convenience libraries * rra@debian.org--lenny/debian-policy--devel--3.7--patch-11 fix FTBFS when built twice in a row * rra@debian.org--lenny/debian-policy--devel--3.7--patch-12 Source in .changes may contain a version number * rra@debian.org--lenny/debian-policy--devel--3.7--patch-13 Replace 822-date reference to date -R * rra@debian.org--lenny/debian-policy--devel--3.7--patch-14 Merge lists of urgency values and include a complete list * rra@debian.org--lenny/debian-policy--devel--3.7--patch-15 Document the type field in shlibs and its use with udebs * rra@debian.org--lenny/debian-policy--devel--3.7--patch-16 Packages using debconf must support internationalization * rra@debian.org--lenny/debian-policy--devel--3.7--patch-17 Clean up Uploaders and add Russ Allbery * rra@debian.org--lenny/debian-policy--devel--3.7--patch-18 Update the common-licenses list * rra@debian.org--lenny/debian-policy--devel--3.7--patch-19 Add ttf-japanese-gothic and ttf-japanese-mincho virtual packages * rra@debian.org--lenny/debian-policy--devel--3.7--patch-20 Finalize changes for 3.7.3.0 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-21 Don't try to compress FHS files before installation * rra@debian.org--lenny/debian-policy--devel--3.7--patch-22 Update Standards-Version to 3.7.3 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-23 Drop docbook-xml from the doc-base file for debconf-spec * rra@debian.org--lenny/debian-policy--devel--3.7--patch-24 Finalize date in upgrading-checklist * rra@debian.org--lenny/debian-policy--devel--3.7--patch-25 Mention apt and aptitude as examples of dpkg frontends * rra@debian.org--lenny/debian-policy--devel--3.7--patch-26 Fix capitalization of Idempotency in heading * rra@debian.org--lenny/debian-policy--devel--3.7--patch-27 Mention apt-get, not apt, and fix typo * rra@debian.org--lenny/debian-policy--devel--3.7--patch-28 Support for wrapped Uploaders is mandatory, clarify wrapping * rra@debian.org--lenny/debian-policy--devel--3.7--patch-29 FHS and FSSTND build and copyright cleanup * rra@debian.org--lenny/debian-policy--devel--3.7--patch-30 Add Emacs indent-tab-mode setting * rra@debian.org--lenny/debian-policy--devel--3.7--patch-31 Standardize manual page encoding * rra@debian.org--lenny/debian-policy--devel--3.7--patch-32 Debian packages should not use convenience libraries * rra@debian.org--lenny/debian-policy--devel--3.7--patch-33 New Breaks dependency field * rra@debian.org--lenny/debian-policy--devel--3.7--patch-34 Add Homepage control field * rra@debian.org--lenny/debian-policy--devel--3.7--patch-35 Update section list and base system definition * rra@debian.org--lenny/debian-policy--devel--3.7--patch-36 Add Apache 2.0 to common-licenses * rra@debian.org--lenny/debian-policy--devel--3.7--patch-37 non-free and contrib packages should explain in copyright * rra@debian.org--lenny/debian-policy--devel--3.7--patch-38 Standardize heading spacing in upgrading-checklist * rra@debian.org--lenny/debian-policy--devel--3.7--patch-39 Add md5sums control file * rra@debian.org--lenny/debian-policy--devel--3.7--patch-40 Add parallel=n and move DEB_BUILD_OPTS section * rra@debian.org--lenny/debian-policy--devel--3.7--patch-41 Add README.source and the patch target * rra@debian.org--lenny/debian-policy--devel--3.7--patch-42 Clarify mandatory config files in /etc * rra@debian.org--lenny/debian-policy--homepage--3.7--patch-2 tag of rra@debian.org--lenny/debian-policy--devel--3.7--patch-27 * rra@debian.org--lenny/debian-policy--homepage--3.7--patch-3 Add Homepage control field * rra@debian.org--lenny/debian-policy--homepage--3.7--patch-4 Homepage isn't allowed in binary source stanzas * rra@debian.org--lenny/debian-policy--homepage--3.7--patch-5 Homepage is allowed in binary stazas * rra@debian.org--lenny/debian-policy--non-free--3.7--base-0 tag of rra@debian.org--lenny/debian-policy--devel--3.7--patch-29 * rra@debian.org--lenny/debian-policy--non-free--3.7--patch-1 non-free and contrib packages should explain in copyright * rra@debian.org--lenny/debian-policy--non-free--3.7--patch-2 Retabify change * rra@debian.org--lenny/debian-policy--parallel--3.7--base-0 tag of rra@debian.org--lenny/debian-policy--devel--3.7--patch-27 * rra@debian.org--lenny/debian-policy--parallel--3.7--patch-1 Add parallel=n and move DEB_BUILD_OPTS section * rra@debian.org--lenny/debian-policy--parallel--3.7--patch-2 DEB_BUILD_OPTIONS must start with a lowercase letter * rra@debian.org--lenny/debian-policy--readme-source--3.7--base-0 tag of rra@debian.org--lenny/debian-policy--devel--3.7--patch-30 * rra@debian.org--lenny/debian-policy--readme-source--3.7--patch-1 Add README.source and the patched target * rra@debian.org--lenny/debian-policy--readme-source--3.7--patch-2 Fix missing > in README.source change * rra@debian.org--lenny/debian-policy--readme-source--3.7--patch-3 Change patch target, allow external docs * rra@debian.org--lenny/debian-policy--sections--3.7--base-0 tag of rra@debian.org--lenny/debian-policy--devel--3.7--patch-27 * rra@debian.org--lenny/debian-policy--sections--3.7--patch-1 Update section list and base system definition git-archimport-id: srivasta@debian.org--lenny/debian-policy--devel--3.7--patch-3 --- debconf-spec.desc | 3 - debian/changelog | 70 +++- debian/control | 4 +- debian/copyright | 46 +-- debian/rules | 23 +- menu-policy.sgml | 3 + mime-policy.sgml | 3 + mm1.32-patch | 46 --- perl-policy.sgml | 3 + policy-process.sgml | 3 + policy.sgml | 631 ++++++++++++++++++++++++--------- upgrading-checklist.html | 87 ++++- virtual-package-names-list.txt | 9 +- 13 files changed, 639 insertions(+), 292 deletions(-) delete mode 100644 mm1.32-patch diff --git a/debconf-spec.desc b/debconf-spec.desc index c021766..098f503 100644 --- 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 ee068fc..0870acc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,51 @@ -debian-policy (3.7.3.0) UNRELEASED; urgency=low +debian-policy (3.7.4.0) unstable; urgency=low + + * Bug fix: "[PROPOSAL] "debian/README.source" file for packages with + non-trivial source", thanks to Wouter Verhelst, Jörg Sommer, Colin Watson, + and Junichi Uekawa (Closes: #250202). + * Bug fix: "[AMENDMENT 11/02/2008] Manual page encoding", thanks to + Colin Watson (Closes: #440420). + * Bug fix: "[PROPOSAL] common interface for parallel building in + DEB_BUILD_OPTIONS", thanks to Loïc Minier, Peter Samuelson, and Robert + Millan (Closes: #209008). + * Bug fix: "Please clarify splitting/syntax of DEB_BUILD_OPTIONS", thanks to + Loïc Minier, Peter Samuelson, Robert Millan, and Guillem Jover + (Closes: #430649). + * Bug fix: "Documentation for Breaks in dpkg", thanks to Ian Jackson + (Closes: #379150). + * Bug fix: "support for wrapped Uploaders should now be mandatory" + (Closes: #431813). + * Bug fix: "[PROPOSAL] Add should not embed code from other packages", + thanks to Neil McGovern, Colin Watson, Bill Allombert, Steve Langasek, + Kurt Roeckx, and others (Closes: #392362). + * Bug fix: "Homepage field in debian/control undocumented", thanks to + Mario Iseli (Closes: #452105). + * Bug fix: "Policy inconsistent with reality: base subsection no longer + used", thanks to Magnus Holmgren, Bernd Zeimetz, and Colin Watson + (Closes: #442070). + * Bug fix: "Inclusion of Apache Software License versions in + /usr/share/common-licenses", thanks to Barry Hawkins (Closes: #291460). + * Bug fix: "[Amended] copyright should include notice if a package is + not a part of Debian distribution", thanks to Taketoshi Sano + (Closes: #65577). + * Bug fix: "scripts as configuration files: should vs. must", thanks to Frank + Küster (Closes: #403391). + * Bug fix: "Examples of dpkg frontends should mention apt now", thanks + to Josh Triplett (Closes: #455602). + * Bug fix: "Minor typos and wording suggestions", thanks to Michael + Tautschnig (Closes: #422552). + * Add an md5sums control file. + * Remove build system support for FHS 2.1 and FSSTND, mostly commented out. + * Remove the FSSTND license from debian/copyright; no FSSTND files are + currently part of policy. + * Update FHS copyright dates in debian/copyright. + * Standardize the spacing around headings in upgrading-checklist.html. + -- + +debian-policy (3.7.3.0) unstable; urgency=low + + * Bug fix: "FTBFS if built twice in a row" (Closes: #424212). * Bug fix: "[PROPOSAL] Document ~ behavior in version numbers", thanks to Nicolas François and Marc Brockschmidt (Closes: #382612). * Bug fix: "Please add 'local' to list of supra-POSIX features that @@ -20,8 +66,26 @@ debian-policy (3.7.3.0) UNRELEASED; urgency=low virtual packages. * Bug fix: "Small spelling errors and erratic sentences in debian-policy", thanks to Michiel de Boer. (Closes: #435207). - - -- + * Bug fix: "Source field of .changes files may contain a version number" + (Closes: #431813). + * Bug fix: "822-date is deprecated (use date -R instead)" (Closes: #448035). + * Bug fix: "5.6.17 (Urgency) should list emergency, maybe a normative + list?" (Closes: #412634). + * Bug fix: "[PROPOSAL] Document support of package types in shlibs + files", thanks to Franz Pop and Raphaël Hertzog (Closes: #363133). + * Bug fix: "Introduce a requirement for internationalisation of debconf + templates", thanks to Christian Perrier (Closes: #402975). + * Bug fix: "GFDL is now in common-licenses". Also add the rest of the + specific license versions and the GPLv3 (Closes: #420701). + * 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 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 a278088..4c19022 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: debian-policy Section: doc Priority: optional Maintainer: Debian Policy List -Uploaders: Julian Gilbey , Manoj Srivastava , Josip Rodin -Standards-Version: 3.6.2.2 +Uploaders: Manoj Srivastava , Russ Allbery +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/copyright b/debian/copyright index 545ed36..4b43882 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,10 +4,11 @@ documents. It was originally assembled by Christian Schwarz and is now maintained by the Debian Policy Group . -The FHS and FSSTND documents were downloaded from +The FHS documents were downloaded from http://www.pathname.com/fhs/. ------------------------------------------------------------------------------ + Copyright of the Debian Policy Manual: Copyright (C) 1996 Ian Jackson. @@ -32,18 +33,14 @@ MA 02110-1301 USA Copyright of the Filesystem Hierarchy Standard (FHS) -Copyright (C) 1994-2000 Daniel Quinlan +Copyright © 1994-2004 Daniel Quinlan +Copyright © 2001-2004 Paul 'Rusty' Russell +Copyright © 2003-2004 Christopher Yeoh Permission is granted to make and distribute verbatim copies of this standard provided the copyright and this permission notice are preserved on all copies. -[troff source includes the following paragraph: -Permission is granted to process this file through a typesetter (such as -troff) and print the results, provided the printed document carries a -permission notice identical to this one except for the removal of this -paragraph (this paragraph not being relevant to the printed document).] - Permission is granted to copy and distribute modified versions of this standard under the conditions for verbatim copying, provided also that the title page is labeled as modified including a reference to the @@ -56,36 +53,3 @@ Permission is granted to copy and distribute translations of this standard into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the copyright holder. - - ------------------------------------------------------------------------------- - -Copyright of the Linux Filesystem Standard (FSSTND). - - -Copyright (C) 1994, 1995 Daniel Quinlan - -Permission is granted to copy and distribute verbatim copies of this -standard provided the copyright and this permission notice are -preserved on all copies. - -Permission is granted for FSSTND contributors and participants to copy -and distribute modified versions of this standard under the conditions -for verbatim copying for purposes of filesystem standardization -activities only, and subject to those restrictions listed below. - -The following restrictions apply to reproducing or transmitting the -document in any form: - - o All copies or portions thereof must identify the document's title - and section, and must be accompanied by this entire notice in a - prominent location. - - o No portion of this document may be redistributed in any modified or - abridged form without the prior approval of the FSSTND coordinator. - -Any entities seeking permission to distribute any material derived -from this document (other than verbatim copies) must contact the -FSSTND coordinator for the appropriate license. - --------------------------------------------------------------------------- diff --git a/debian/rules b/debian/rules index 25541e7..1e31ad4 100755 --- a/debian/rules +++ b/debian/rules @@ -50,15 +50,13 @@ DESC_FILES := debian-policy debian-menu-policy debian-perl-policy \ # While we have two versions of the FHS installed in the source package, # we need to modify this to handle it. This is the easiest way to do it. # FHS_ARCHIVE := $(wildcard fhs*.tar.gz) -# And with version 2.1, we have to build the text and dvi versions -# ourselves :-( FHS_ARCHIVE := fhs-2.3-source.tar.gz FHS_HTML := fhs-2.3.html FHS_FILES := fhs-2.3.ps.gz fhs-2.3.txt.gz fhs-2.3.pdf.gz FHS_NEW_ARCHIVE := FHS_NEW_HTML := FHS_NEW_FILES := -# FSSTND_FILES := FSSTND-FAQ fsstnd-1.2.dvi.gz fsstnd-1.2.ps.gz fsstnd-1.2.txt.gz + POLICY_FILES = $(SGML_FILES:=.sgml) $(SGML_FILES:=.txt.gz) \ virtual-package-names-list.txt \ upgrading-checklist.txt libc6-migration.txt version.ent \ @@ -90,17 +88,6 @@ stamp-build: version.ent $(sanitycheck) $(SGML_FILES:=.html.tar.gz) \ $(SGML_FILES:=.txt.gz) \ policy.ps.gz policy.pdf.gz - tar -zxf $(FHS_ARCHIVE) - # Need to use a patched tmac.m macro file if we're using a pre-1.16 - # groff; version 1.16 is apparently fixed - if dpkg --compare-versions "$(shell dpkg -s groff | sed -n -e 's/Version: //p')" lt 1.16; then \ - cp /usr/share/groff/tmac/tmac.m fhs && \ - cd fhs && patch -p1 < ../mm1.32-patch; \ - fi - # The extra '.' in the tmac path won't harm if unnecessary - #GROFF_TMAC_PATH=. GROFF_NO_SGR=1 $(MAKE) -C fhs fhs.ps fhs.pdf fhs.txt - #links -dump fhs-changes-2.1.html | perl -pe 's/[\r\0]//g' > \ - # fhs/fhs-changes-2.1.txt links -dump upgrading-checklist.html | perl -pe 's/[\r\0]//g' > \ upgrading-checklist.txt $(MAKE) -C debconf_spec all @@ -137,7 +124,6 @@ stamp-policy: build $(sanitycheck) # test -f stamp-build || $(MAKE) -f debian/rules build rm -rf $(TMPTOP) $(make_directory) $(TMPTOP)/DEBIAN -# $(make_directory) $(DOCDIR)/fsstnd $(make_directory) $(DOCDIR)/fhs $(make_directory) $(LIBDIR) # create a substvar to reference from debian/control so that @@ -147,12 +133,10 @@ stamp-policy: build $(sanitycheck) # itself... echo "debian-policy:Version=$(version)" > debian/substvars $(install_file) $(POLICY_FILES) $(DOCDIR)/ -# $(install_file) $(FSSTND_FILES) $(DOCDIR)/fsstnd/ - $(install_file) $(FHS_FILES) $(DOCDIR)/fhs/ $(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/ @@ -169,6 +153,9 @@ stamp-policy: build $(sanitycheck) tar -C $(DOCDIR) -zxf $$file.html.tar.gz; \ done $(install_file) $(FHS_HTML) $(DOCDIR)/fhs + @set -ex; \ + cd debian/tmp; \ + find . -type f -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums sed -e 's/#PACKAGE#/$(package)/g' debian/postinst.in > debian/postinst sed -e 's/#PACKAGE#/$(package)/g' debian/prerm.in > debian/prerm $(install_program) debian/postinst debian/tmp/DEBIAN/ diff --git a/menu-policy.sgml b/menu-policy.sgml index 67389af..e01cfbe 100644 --- a/menu-policy.sgml +++ b/menu-policy.sgml @@ -477,3 +477,6 @@ + + + diff --git a/mime-policy.sgml b/mime-policy.sgml index b4ea5a3..38db3ef 100644 --- a/mime-policy.sgml +++ b/mime-policy.sgml @@ -144,3 +144,6 @@ + + + diff --git a/mm1.32-patch b/mm1.32-patch deleted file mode 100644 index 54bc8de..0000000 --- a/mm1.32-patch +++ /dev/null @@ -1,46 +0,0 @@ -Patch from Daniel Quinlan for mm-1.32 groff macros to make it work -with FHS source - -diff -ur mm1.32/tmac.m tmac/tmac.m ---- mm1.32/tmac.m Thu Sep 2 22:37:52 1999 -+++ tmac/tmac.m Thu Jan 27 23:28:22 2000 -@@ -539,10 +539,12 @@ - .\" Break here to avoid problems with new linesetting of the previous line. - .\" Hope this doesn't break anything else :-) - .\" Don't break if arg_4 is a '1'. -+.if \\n[D]>2 .tm PGFORM: \\$* - .if ''\\$4' .br -+.if \\n[D]>3 .tm PGFORM: IN l:\\n[.l] p:\\n[.p] o:\\n[.o] - .ie !''\\$1' \{\ - . ll \\$1 --. nr @ll \n[.l] -+. nr @ll \\n[.l] - . nr @cur-ll \\n[@ll] - . lt \\n[@ll]u - .\} -@@ -553,17 +555,23 @@ - .\" - .ie !''\\$2' \{\ - . pl \\$2 --. nr @pl \n[.p] -+. nr @pl \\n[.p] - .\} - .el .pl \\n[@pl]u - .\" - .ie !''\\$3' \{\ - . po \\$3 --. nr @po \n[.o] -+. nr @po \\n[.o] - .\} - .el .po \\n[@po]u -+.if \\n[D]>3 .tm PGFORM: OUT l:\\n[.l] p:\\n[.p] o:\\n[.o] -+.if \\n[D]>2 .tm PGFORM: ll=\\n[@ll], pl=\\n[@pl], po=\\n[@po] - 'in 0 - .pg@move-trap -+.if \\n[D]>2 \{\ -+. tm Traps: -+. ptr -+.\} - .. - .\"------------- - .\" .MOVE y [[x] linelength] diff --git a/perl-policy.sgml b/perl-policy.sgml index 7ec183e..1421b46 100644 --- a/perl-policy.sgml +++ b/perl-policy.sgml @@ -488,3 +488,6 @@ perl -MExtUtils::Embed -e ldopts + + + diff --git a/policy-process.sgml b/policy-process.sgml index c829d96..8c433ff 100644 --- a/policy-process.sgml +++ b/policy-process.sgml @@ -342,3 +342,6 @@ + + + diff --git a/policy.sgml b/policy.sgml index 46ae4eb..ae7149f 100644 --- a/policy.sgml +++ b/policy.sgml @@ -640,14 +640,14 @@

The Debian archive maintainers provide the authoritative list of sections. At present, they are: - admin, base, comm, - contrib, devel, doc, + admin, comm, + devel, doc, editors, electronics, embedded, games, gnome, graphics, hamradio, interpreters, kde, libs, libdevel, mail, math, misc, net, news, - non-free, oldlibs, + oldlibs, otherosfs, perl, python, science, shells, sound, tex, text, @@ -1078,15 +1078,15 @@

The base system is a minimum subset of the Debian GNU/Linux system that is installed before everything else - on a new system. Thus, only very few packages are allowed - to go into the base section to keep the required - disk usage very small. + on a new system. Only very few packages are allowed to form + part of the base system, in order to keep the required disk + usage very small.

- Most of these packages will have the priority value - required or at least important, and many - of them will be tagged essential (see below). + The base system consists of all those packages with priority + required or important. Many of them will + be tagged essential (see below).

@@ -1220,6 +1220,13 @@

+

+ Packages which use the Debian Configuration management + specification must allow for translation of their messages + by using a gettext-based system such as the one provided by + the po-debconf package. +

+

Packages should try to minimize the amount of prompting they need to do, and they should ensure that the user @@ -1516,14 +1523,7 @@ keyword=value settings in the dpkg changelog format (though there is currently only one useful keyword, - urgency). - Recognized urgency values are low, - medium, high and emergency. - They have an effect on how quickly a package will be - considered for inclusion into the testing - distribution, and give an indication of the importance - of any fixes included in this upload. - + urgency).

@@ -1567,8 +1567,7 @@

The date should be in RFC822 format - This is generated by the 822-date - program. + This is generated by date -R. ; it should include the time zone specified numerically, with the time zone name or abbreviation optionally present as a comment in parentheses. @@ -1927,6 +1926,19 @@ possible is a good idea.

+ + patch (optional) + +

+ This target performs whatever additional actions are + required to make the source ready for editing (unpacking + additional upstream archives, applying patches, etc.). + It is recommended to be implemented for any package where + dpkg-source -x does not result in source ready + for additional modification. See + . +

+

@@ -1987,6 +1999,105 @@ or system information; the GNU style variables should be used for that.

+ + + debian/rules and + DEB_BUILD_OPTIONS + +

+ Supporting the standardized environment variable + DEB_BUILD_OPTIONS is recommended. This variable can + contain several flags to change how a package is compiled and + built. Each flag must be in the form flag or + flag=options. If multiple flags are + given, they must be separated by whitespace. + Some packages support any delimiter, but whitespace is the + easiest to parse inside a makefile and avoids ambiguity with + flag values that contain commas. + + flag must start with a lowercase letter + (a-z) and consist only of lowercase letters, + numbers (0-9), and the characters + - and _ (hyphen and underscore). + options must not contain whitespace. The same + tag should not be given multiple times with conflicting + values. Package maintainers may assume that + DEB_BUILD_OPTIONS will not contain conflicting tags. +

+ +

+ The meaning of the following tags has been standardized: + + noopt + + The presence of this tag means that the package should + be compiled with a minimum of optimization. For C + programs, it is best to add -O0 to + CFLAGS (although this is usually the default). + Some programs might fail to build or run at this level + of optimization; it may be necessary to use + -O1, for example. + + nostrip + + This tag means that the debugging symbols should not be + stripped from the binary during installation, so that + debugging information may be included in the package. + + parallel=n + + This tag means that the package should be built using up + to n parallel processes if the package build + system supports this. + Packages built with make can often implement + this by passing the -jn option to + make. + + If the package build system does not support parallel + builds, this string must be ignored. If the package + build system only supports a lower level of concurrency + than n, the package should be built using as + many parallel processes as the package build system + supports. It is up to the package maintainer to decide + whether the package build times are long enough and the + package build system is robust enough to make supporting + parallel builds worthwhile. + + +

+ +

+ Unknown flags must be ignored by debian/rules. +

+ +

+ The following makefile snippet is an example of how one may + implement the build options; you will probably have to + massage this example in order to make it work for your + package. + +CFLAGS = -Wall -g +INSTALL = install +INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644 +INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 +INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 755 +INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755 + +ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif + +

+ @@ -2077,6 +2188,85 @@ the file to the list in debian/files.

+ + Convenience copies of code + +

+ Some software packages include in their distribution convenience + copies of code from other software packages, generally so that + users compiling from source don't have to download multiple + packages. Debian packages should not make use of these + convenience copies unless the included package is explicitly + intended to be used in this way. + For example, parts of the GNU build system work like this. + + If the included code is already in the Debian archive in the + form of a library, the Debian packaging should ensure that + binary packages reference the libraries already in Debian and + the convenience copy is not used. If the included code is not + already in Debian, it should be packaged separately as a + prerequisite if possible. + + Having multiple copies of the same code in Debian is + inefficient, often creates either static linking or shared + library conflicts, and, most importantly, increases the + difficulty of handling security vulnerabilities in the + duplicated code. + +

+ + + + Source package handling: + debian/README.source + +

+ If running dpkg-source -x on a source package + doesn't produce the source of the package, ready for editing, + and allow one to make changes and run + dpkg-buildpackage to produce a modified package + without taking any additional steps, creating a + debian/README.source documentation file is + recommended. This file should explain how to do all of the + following: + + Generate the fully patched source, in a form ready for + editing, that would be built to create Debian + packages. Doing this with a patch target in + debian/rules is recommended; see + . + Modify the source and save those modifications so that + they will be applied when building the package. + Remove source modifications that are currently being + applied when building the package. + Optionally, document what steps are necessary to + upgrade the Debian source package to a new upstream version, + if applicable. + + This explanation should include specific commands and mention + any additional required Debian packages. It should not assume + familiarity with any specific Debian packaging system or patch + management tools. +

+ +

+ This explanation may refer to a documentation file installed by + one of the package's build dependencies provided that the + referenced documentation clearly explains these tasks and is not + a general reference manual. +

+ +

+ debian/README.source may also include any other + information that would be helpful to someone modifying the + source package. Even if the package doesn't fit the above + description, maintainers are encouraged to document in a + debian/README.source file any source package with a + particularly complex or unintuitive source layout or build + system (for example, a package that builds the same source + multiple times to generate different binary packages). +

+ @@ -2183,6 +2373,7 @@ Package: libc6 Priority (recommended) Build-Depends et al Standards-Version (recommended) + Homepage

@@ -2197,6 +2388,7 @@ Package: libc6 Essential Depends et al Description (mandatory) + Homepage

@@ -2253,6 +2445,7 @@ Package: libc6 Installed-Size Maintainer (mandatory) Description (mandatory) + Homepage

@@ -2277,6 +2470,7 @@ Package: libc6 Build-Depends et al Standards-Version (recommended) Files (mandatory) + Homepage

@@ -2336,14 +2530,14 @@ Package: libc6

- In a main source control information, a .changes - or a .dsc file this may contain only the name - of the source package. + In debian/control or a .dsc file, + this field must contain only the name of the source package.

- In the control file of a binary package it may be followed - by a version number in parentheses + In a binary package control file or a .changes + file, the source package name may be followed by a version + number in parentheses It is customary to leave a space after the package name if a version number is specified. . @@ -2392,16 +2586,10 @@ Package: libc6

Any parser that interprets the Uploaders field in - debian/control should permit it to span multiple - lines - In the future, the Uploaders field in - debian/control (but not other control files) - will be permitted to span multiple lines and interpreting - a multi-line Uploaders field shall be mandatory. - . Line breaks in an Uploaders field that spans - multiple lines are not significant and the semantics of - the field are the same as if the line breaks had not been - present. + debian/control must permit it to span multiple + lines. Line breaks in an Uploaders field that spans multiple + lines are not significant and the semantics of the field are + the same as if the line breaks had not been present.

@@ -2546,7 +2734,8 @@ Package: libc6 Package interrelationship fields: Depends, Pre-Depends, - Recommends, Suggests, Conflicts, + Recommends, Suggests, + Breaks, Conflicts, Provides, Replaces, Enhances @@ -2950,10 +3139,19 @@ Package: libc6

This is a description of how important it is to upgrade to this version from previous ones. It consists of a single - keyword usually taking one of the values low, - medium or high (not case-sensitive) - followed by an optional commentary (separated by a space) - which is usually in parentheses. For example: + keyword taking one of the values low, + medium, high, emergency, or + critical + Other urgency values are supported with configuration + changes in the archive software but are not used in Debian. + The urgency affects how quickly a package will be considered + for inclusion into the testing distribution and + gives an indication of the importance of any fixes included + in the upload. Emergency and critical are + treated as synonymous. + (not case-sensitive) followed by an optional + commentary (separated by a space) which is usually in + parentheses. For example: Urgency: low (HIGH for users of diversions) @@ -3117,6 +3315,19 @@ Package: libc6

+ + Homepage + +

+ The URL of the web site for this package, preferably (when + applicable) the site from which the original source can be + obtained and any additional upstream documentation or + information may be found. The content of this field is a + simple URL without any surrounding characters such as + <>. +

+ + @@ -3240,7 +3451,7 @@ Package: libc6 - Maintainer scripts Idempotency + Maintainer scripts idempotency

It is necessary for the error recovery procedures that the @@ -3328,8 +3539,8 @@ Package: libc6 deconfigured's-postinst abort-deconfigure in-favour failed-install-package version - removing conflicting-package - version + [removing conflicting-package + version] @@ -3354,9 +3565,9 @@ Package: libc6 deconfigured's-prerm deconfigure in-favour package-being-installed - version removing + version [removing conflicting-package - version + version] @@ -3437,11 +3648,30 @@ Package: libc6 - If a "conflicting" package is being removed at the same time: + If a "conflicting" package is being removed at the same time, + or if any package will be broken (due to Breaks): - If any packages depended on that conflicting - package and --auto-deconfigure is + If --auto-deconfigure is + specified, call, for each package to be deconfigured + due to Breaks: + +deconfigured's-prerm deconfigure \ + in-favour package-being-installed version + + Error unwind: + +deconfigured's-postinst abort-deconfigure \ + in-favour package-being-installed-but-failed version + + The deconfigured packages are marked as + requiring configuration, so that if + --install is used they will be + configured again if possible. + + + If any packages depended on a conflicting + package being removed and --auto-deconfigure is specified, call, for each such package: deconfigured's-prerm deconfigure \ @@ -3460,7 +3690,7 @@ Package: libc6 configured again if possible. - To prepare for removal of the conflicting package, call: + To prepare for removal of each conflicting package, call: conflictor's-prerm remove \ in-favour package new-version @@ -3883,13 +4113,16 @@ Package: libc6 Whitespace may appear at any point in the version specification subject to the rules in , and must appear where it's necessary to - disambiguate; it is not otherwise significant. For + disambiguate; it is not otherwise significant. All of the + relationship fields may span multiple lines. For consistency and in case of future changes to dpkg it is recommended that a single space be used after a version relationship and before a version number; it is also conventional to put a single space after each comma, on either side of each vertical bar, and before - each open parenthesis. + each open parenthesis. When wrapping a relationship field, it + is conventional to do so after a comma and before the space + following that comma.

@@ -3954,16 +4187,19 @@ Build-Depends: kernel-headers-2.2.10 [!hurd-i386],

This is done using the Depends, Pre-Depends, - Recommends, Suggests, Enhances and - Conflicts control file fields. + Recommends, Suggests, Enhances, + Breaks and Conflicts control file fields.

- These six fields are used to declare a dependency + These seven fields are used to declare a dependency relationship by one package on another. Except for - Enhances, they appear in the depending (binary) - package's control file. (Enhances appears in the - recommending package's control file.) + Enhances and Breaks, they appear in the + depending (binary) package's control file. + (Enhances appears in the recommending package's + control file, and Breaks appears in the version of + depended-on package which causes the named package to + break).

@@ -3982,7 +4218,8 @@ Build-Depends: kernel-headers-2.2.10 [!hurd-i386], in detail below. (The other three dependency fields, Recommends, Suggests and Enhances, are only used by the various front-ends - to dpkg such as dselect.) + to dpkg such as apt-get, + aptitude, and dselect.)

@@ -4000,7 +4237,7 @@ Build-Depends: kernel-headers-2.2.10 [!hurd-i386], (based on rules below), and some packages may not be able to rely on their dependencies being present when being installed or removed, depending on which side of the break - of the circular dependcy loop they happen to be on. If one + of the circular dependency loop they happen to be on. If one of the packages in the loop has no postinst script, then the cycle will be broken at that package, so as to ensure that all postinst scripts run with the dependencies properly @@ -4136,6 +4373,53 @@ Build-Depends: kernel-headers-2.2.10 [!hurd-i386],

+ + Packages which break other packages - Breaks + +

+ Using Breaks may cause problems for upgrades from older + versions of Debian and should not be used until the stable + release of Debian supports Breaks. +

+ +

+ When one binary package declares that it breaks another, + dpkg will refuse to allow the package which + declares Breaks be installed unless the broken + package is deconfigured first, and it will refuse to + allow the broken package to be reconfigured. +

+ +

+ A package will not be regarded as causing breakage merely + because its configuration files are still installed; it must + be at least half-installed. +

+ +

+ A special exception is made for packages which declare that + they break their own package name or a virtual package which + they provide (see below): this does not count as a real + breakage. +

+ +

+ Normally a Breaks entry will have an "earlier than" + version clause; such a Breaks is introduced in the + version of an (implicit or explicit) dependency which + violates an assumption or reveals a bug in earlier versions + of the broken package. This use of Breaks will + inform higher-level package management tools that broken + package must be upgraded before the new one. +

+ +

+ If the breaking package also overwrites some files from the + older package, it should use Replaces (not + Conflicts) to ensure this goes smoothly. +

+ + Conflicting binary packages - Conflicts @@ -4181,7 +4465,9 @@ Build-Depends: kernel-headers-2.2.10 [!hurd-i386], "earlier than" version clause. This would prevent dpkg from upgrading or installing the package which declared such a conflict until the upgrade or removal - of the conflicted-with package had been completed. + of the conflicted-with package had been completed. Instead, + Breaks may be used (once Breaks is supported + by the stable release of Debian).

@@ -4192,7 +4478,7 @@ Build-Depends: kernel-headers-2.2.10 [!hurd-i386], As well as the names of actual ("concrete") packages, the package relationship fields Depends, Recommends, Suggests, Enhances, - Pre-Depends, Conflicts, + Pre-Depends, Breaks, Conflicts, Build-Depends, Build-Depends-Indep, Build-Conflicts and Build-Conflicts-Indep may mention "virtual packages". @@ -4228,16 +4514,16 @@ Provides: bar

- If a dependency or a conflict has a version number attached + If a relationship field has a version number attached then only real packages will be considered to see whether the relationship is satisfied (or the prohibition violated, - for a conflict) - it is assumed that a real package which - provides the virtual package is not of the "right" version. - So, a Provides field may not contain version - numbers, and the version number of the concrete package - which provides a particular virtual package will not be - looked at when considering a dependency on or conflict with - the virtual package name. + for a conflict or breakage) - it is assumed that a real + package which provides the virtual package is not of the + "right" version. So, a Provides field may not + contain version numbers, and the version number of the + concrete package which provides a particular virtual package + will not be looked at when considering a dependency on or + conflict with the virtual package name.

@@ -4956,6 +5242,19 @@ dpkg-shlibdeps debian/tmp/usr/bin/* debian/tmp/usr/sbin/* \ utilities to specify a different substvars file.

+

+ If you are creating a udeb for use in the Debian Installer, you + will need to specify that dpkg-shlibdeps should use + the dependency line of type udeb by adding + -tudeb as option + dh_shlibdeps from the debhelper suite + will automatically add this option if it knows it is + processing a udeb. + . If there is no dependency line of type udeb + in the shlibs file, dpkg-shlibdeps will + fall back to the regular dependency line. +

+

For more details on dpkg-shlibdeps, please see and @@ -4971,7 +5270,7 @@ dpkg-shlibdeps debian/tmp/usr/bin/* debian/tmp/usr/sbin/* \ beginning with # are considered to be comments and are ignored. Each line is of the form: -library-name soname-version-number dependencies ... +[type: ]library-name soname-version dependencies ...

@@ -4981,6 +5280,13 @@ dpkg-shlibdeps debian/tmp/usr/bin/* debian/tmp/usr/sbin/* \ installs the shared library /usr/lib/libz.so.1.1.3.

+

+ type is an optional element that indicates the type + of package for which the line is valid. The only type currently + in use is udeb. The colon and space after the type are + required. +

+

library-name is the name of the shared library, in this case libz. (This must match the name part @@ -4988,10 +5294,10 @@ dpkg-shlibdeps debian/tmp/usr/bin/* debian/tmp/usr/sbin/* \

- soname-version-number is the version part of the - soname of the library. The soname is the thing that must - exactly match for the library to be recognized by the - dynamic linker, and is usually of the form + soname-version is the version part of the soname of + the library. The soname is the thing that must exactly match + for the library to be recognized by the dynamic linker, and is + usually of the form name.so.major-version, in our example, libz.so.1. This can be determined using the command @@ -5023,6 +5329,14 @@ libz 1 zlib1g (>= 1:1.1.3) the dynamic linker about using older shared libraries with newer binaries.

+ +

+ As zlib1g also provides a udeb containing the shared library, + there would also be a second line: + +udeb: libz 1 zlib1g-udeb (>= 1:1.1.3) + +

@@ -5047,7 +5361,10 @@ install -m644 debian/shlibs.package debian/package/DEBIAN/ debian/rules without using a debian/shlibs file at all, This is what dh_makeshlibs in the - debhelper suite does. + debhelper suite does. If your package also has a udeb + that provides a shared library, dh_makeshlibs can + automatically generate the udeb: lines if you specify + the name of the udeb with the --add-udeb option. since the debian/shlibs file itself is ignored by dpkg-shlibdeps. @@ -6071,12 +6388,13 @@ Reloading description configuration...done. via cron, it should place a file with the name of the package in one or more of the following directories: +/etc/cron.hourly /etc/cron.daily /etc/cron.weekly /etc/cron.monthly As these directory names imply, the files within them are - executed on a daily, weekly, or monthly basis, + executed on an hourly, daily, weekly, or monthly basis, respectively. The exact times are listed in /etc/crontab.

@@ -6084,13 +6402,12 @@ Reloading description configuration...done. All files installed in any of these directories must be scripts (e.g., shell scripts or Perl scripts) so that they can easily be modified by the local system administrator. - In addition, they should be treated as configuration - files. + In addition, they must be treated as configuration files.

- If a certain job has to be executed more frequently than - daily, the package should install a file + If a certain job has to be executed at some other frequency or + at a specific time, the package should install a file /etc/cron.d/package. This file uses the same syntax as /etc/crontab and is processed by cron automatically. The file must also be @@ -6443,58 +6760,12 @@ INSTALL = install -s # (or use strip on the files in debian/tmp)

Although binaries in the build tree should be compiled with - debugging information by default, it can often be difficult - to debug programs if they are also subjected to compiler - optimization. For this reason, it is recommended to support - the standardized environment - variable DEB_BUILD_OPTIONS. This variable can - contain several flags to change how a package is compiled - and built. -

- -

- - noopt - - The presence of this string means that the package - should be compiled with a minimum of optimization. - For C programs, it is best to add -O0 - to CFLAGS (although this is usually the - default). Some programs might fail to build or run at - this level of optimization; it may be necessary to - use -O1, for example. - - nostrip - - This string means that the debugging symbols should - not be stripped from the binary during installation, - so that debugging information may be included in the package. - - -

- -

- The following makefile snippet is an example of how one may - implement the build options; you will probably have to - massage this example in order to make it work for your - package. - -CFLAGS = -Wall -g -INSTALL = install -INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644 -INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 -INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 755 -INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755 - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -CFLAGS += -O0 -else -CFLAGS += -O2 -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) -INSTALL_PROGRAM += -s -endif - + debugging information by default, it can often be difficult to + debug programs if they are also subjected to compiler + optimization. For this reason, it is recommended to support the + standardized environment variable DEB_BUILD_OPTIONS + (see ). This variable can contain + several flags to change how a package is compiled and built.

@@ -6935,10 +7206,13 @@ ln -fs ../sbin/sendmail debian/tmp/usr/bin/runq

- Note that a script that embeds configuration information - (such as most of the files in /etc/default and - /etc/cron.{daily,weekly,monthly}) is de-facto a - configuration file and should be treated as such. + As noted elsewhere, /etc/init.d scripts, + /etc/default files, scripts installed in + /etc/cron.{hourly,daily,weekly,monthly}, and cron + configuration installed in /etc/cron.d must be + treated as configuration files. In general, any script that + embeds configuration information is de-facto a configuration + file and should be treated as such.

@@ -7380,16 +7654,6 @@ endscript description of the use of dpkg-statoverride.

-

- dpkg-statoverride is a replacement for the - deprecated suidmanager package. Packages which - previously used suidmanager should have a - Conflicts: suidmanager (<< 0.50) entry (or even - (<< 0.52)), and calls to suidregister - and suidunregister should now be simply removed - from the maintainer scripts. -

-

If a system administrator wishes to have a file (or directory or other such thing) installed with owner and @@ -8482,6 +8746,40 @@ name ["syshostname"]: be present in the future.

+ +

+ Manual pages in locale-specific subdirectories of + /usr/share/man should use either UTF-8 or the usual + legacy encoding for that language (normally the one corresponding + to the shortest relevant locale name in + /usr/share/i18n/SUPPORTED). For example, pages under + /usr/share/man/fr should use either UTF-8 or + ISO-8859-1. + man will automatically detect whether UTF-8 is in + use. In future, all manual pages will be required to use + UTF-8. + +

+ +

+ A country name (the DE in de_DE) should not be + included in the subdirectory name unless it indicates a + significant difference in the language, as this excludes + speakers of the language in other countries. + At the time of writing, Chinese and Portuguese are the main + languages with such differences, so pt_BR, + zh_CN, and zh_TW are all allowed. + +

+ +

+ Due to limitations in current implementations, all characters + in the manual page source should be representable in the usual + legacy encoding for that language, even if the file is + actually encoded in UTF-8. Safe alternative ways to write many + characters outside that range may be found in + . +

@@ -8638,7 +8936,14 @@ install-info --quiet --remove /usr/share/info/foobar.info In addition, the copyright file must say where the upstream sources (if any) were obtained. It should name the original authors of the package and the Debian maintainer(s) who were - involved with its creation.

+ involved with its creation. +

+ +

+ Packages in the contrib or non-free categories + should state in the copyright file that the package is not part + of the Debian GNU/Linux distribution and briefly explain why. +

A copy of the file which will be installed in @@ -8656,22 +8961,23 @@ install-info --quiet --remove /usr/share/info/foobar.info

- Packages distributed under the UCB BSD license, the Artistic - license, the GNU GPL, and the GNU LGPL, should refer to the - corresponding files under - /usr/share/common-licenses, -

- For example, - /usr/share/common-licenses/Artistic, + 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 + files under /usr/share/common-licenses, +

+ In particular, /usr/share/common-licenses/BSD, - /usr/share/common-licenses/GPL, - /usr/share/common-licenses/LGPL, - /usr/share/common-licenses/GFDL, - /usr/share/common-licenses/GPL-2, and - /usr/share/common-licenses/LGPL-2.1, and so - on. Note that the GFDL is new here, and the license file - may not yet be in place in - /usr/share/common-licenses/GFDL. + /usr/share/common-licenses/Apache-2.0, + /usr/share/common-licenses/Artistic, + /usr/share/common-licenses/GPL-2, + /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 + respectively.

rather than quoting them in the copyright file. @@ -10286,4 +10592,7 @@ install-info --quiet --remove /usr/share/info/foobar.info + + + diff --git a/upgrading-checklist.html b/upgrading-checklist.html index f3bf0af..2358c2f 100644 --- a/upgrading-checklist.html +++ b/upgrading-checklist.html @@ -53,7 +53,55 @@ picking your way through this list.

The checklist

-3.7.3.0                        unreleased
+3.7.4.0                        unreleased
+
+     * The base section has been removed.  contrib and non-free have been
+       removed from the section list; they are only categories.  The base
+       system is now defined by priority.                        [2.4, 3.7]
+     * If dpkg-source -x doesn't provide the source that will be compiled,
+       a debian/rules patch target is recommended and should do whatever
+       else is necessary.                                        [4.9]
+     * Standardized the format of DEB_BUILD_OPTIONS.  Specified permitted
+       characters for tags, required that tags be whitespace-separated,
+       allowed packages to assume non-conflicting tags, and required
+       unknown flags be ignored.                                 [4.9.1, 10.1]
+     * Added parallel=n to the standardized DEB_BUILD_OPTIONS tags,
+       indicating that a package should be built using up to n parallel
+       processes if the package supports it                      [4.9.1]
+     * Debian packages should not use convience copies of code from other
+       packages unless the included package is explicitly intended to be
+       used that way.                                            [4.13]
+     * If dpkg-source -x doesn't produce source ready for editing and
+       building with dpkg-buildpackage, packages should include a
+       debian/README.source file explaining how to generate the patched
+       source, add a new modification, and remove an existing
+       modification.  This file may also be used to document packaging a
+       new upstream release and any other complexity of the Debian build
+       process.                                                  [4.14]
+     * The Uploaders field in debian/control may be wrapped.     [5.6.3]
+     * New Homepage field for upstream web sites.                [5.6.23]
+     * The Breaks field declares that this package breaks another and
+       prevents installation of the breaking package unless the package
+       named in Breaks is deconfigured first.  This field should not be
+       used until the dpkg in Debian stable supports it.         [6.5, 6.6, 7]
+     * Files in /etc/cron.{hourly,daily,weekly,monthly} must be
+       configuration files (upgraded from should).  Mention the hourly
+       directory.                                                [9.5]
+     * Manual pages in locale-specific directories should use either the
+       legacy encoding for that directory or UTF-8.  Country names should
+       not be included in locale-specific manual page directories unless
+       indicating a significant difference in the language.  All
+       characters in the manual page source should be representable in the
+       legacy encoding for a locale even if the man page is encoded in
+       UTF-8.                                                    [12.1]
+     * The Apache 2.0 license is now in common-licenses and should be
+       referenced rather than quoted in debian/copyright.        [12.5]
+     * Packages in contrib and non-free should state in the copyright file
+       that the package is not part of Debian GNU/Linux and briefly
+       explain why.                                              [12.5]
+
+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)
@@ -66,13 +114,31 @@ picking your way through this list.
        menu structure.  Packages with menu entries should be reviewed to
        see if the menu section has been renamed or if one of the new
        sections would be more appropriate.                       [menu policy]
+     * The Source field in a .changes file may contain a version number
+       in parentheses.                                           [5.6.1]
+     * The acceptable values for the Urgency field are low, medium, high,
+       critical, or emergency.                                   [5.6.17]
+     * The shlibs file now allows an optional type field, indicating the
+       type of package for which the line is valid.  The only currently
+       supported type is udeb, used with packages for the Debian
+       Installer.                                                [8.6]
+     * Packages following the Debian Configuration management
+       specification must allow for translation of their messages by using
+       a gettext-based system such as po-debconf.                [3.9.1]
+     * GFDL 1.2, GPL 3, and LGPL 3 are now in common-licenses and should
+       be referenced rather than quoted in debian/copyright.     [12.5]
+
 3.7.2.2                        Oct 2006
+
      * Maintainer scripts must not be world writeable (up from a
        should to a must)                                         [6.1]
+
 3.7.2.0                        Apr 2006
+
      * Revert the cgi-lib change.                                [11.5]
 
 3.7.1.0                        Apr 2006
+
      * It is now possible to create shared libraries without
        relocatable code (using -fPIC) in certain exceptional cases,
        provided some procedures are followed, and for creating static
@@ -85,6 +151,7 @@ picking your way through this list.
        must  pre-depend on x11-common (>= 1:7.0.0)              [11.8.7] 
 
 3.7.0.0                        Apr 2006
+
      * Packages shipping web server CGI files are expected to install
        them in /usr/lib/cgi-lib/ directories.  This location change
        perhaps should be documented in NEWS                      [11.5]
@@ -112,8 +179,8 @@ picking your way through this list.
        /usr/share/fonts/X11/ now, and /usr/X11R6 is gone.
                                                       [ 11.8.5.2, 11.8.7, etc]
 
-
 3.6.2.0                        2005
+
      * Recommend doc-base, and not menu, for registering package documentation.
      * Run time support programs should live in subdirectories of
        /usr/lib/ or /usr/share, and preferably the shared lib is named
@@ -122,6 +189,7 @@ picking your way through this list.
        allow packages to share image files with the web server [11.5]
 
 3.6.1.0                    Aug 2003
+
      + Prompting the user should be done using debconf. Non debconf
        user prompts are now deprecated. [3.10.1]
 
@@ -164,7 +232,6 @@ picking your way through this list.
      - Window managers compliant with the Window Manager Specification
        Project may add 40 points for ranking in the alternatives [11.8.4]
 
-
 3.5.9.0                    Mar 2003
 
      - The section describing the Description: package field once again has
@@ -178,7 +245,6 @@ picking your way through this list.
        example files can be installed into /usr/share/doc/package
        (rather than /usr/share/doc/package/examples). [12.6]
 
-
 3.5.8.0                    Nov 2002
 
      - It is no longer necessary to keep a log of changes to the upstream
@@ -234,7 +300,6 @@ picking your way through this list.
      - There are new rules for build-indep/build-arch targets and
        there is a new Build-Depend-Indep semantic. [7]
 
-
 3.5.5.0                    May 2001
 
      - Manpages should not rely on header information to have
@@ -261,7 +326,6 @@ picking your way through this list.
        * OpenMotif linked binaries have the same rules as
          OSF/Motif-linked ones [11.8.8]
 
-
 3.5.4.0                    Apr 2001
 
      - The system-wide mail directory is now /var/mail, no longer
@@ -272,7 +336,6 @@ picking your way through this list.
        programs and modules should follow the current Perl policy
        [11.9; perl-policy]
 
-
 3.5.3.0                    Apr 2001
 
      - Build-Depends arch syntax has been changed to be less
@@ -282,25 +345,21 @@ picking your way through this list.
        symbolic links from /usr/share/doc/<package>/examples as
        needed [10.7.3]
 
-
 3.5.2.0                    Feb 2001
 
      - X app-defaults directory has moved from
        /usr/X11R6/lib/X11/app-defaults to /etc/X11/app-defaults [11.8.6]
 
-
 3.5.1.0                    Feb 2001
 
      - dpkg-shlibdeps now uses objdump, so shared libraries have to be
        run through dpkg-shlibdeps as well as executables [8.1]
 
-
 3.5.0.0                    Jan 2001
 
      - Font packages for the X Window System must now declare a
        dependency on xutils (>= 4.0.2) [11.8.5]
 
-
 3.2.1.1                    Jan 2001
 
      - Daemon startup scripts in /etc/init.d/ should not contain
@@ -313,14 +372,12 @@ picking your way through this list.
      - Much of the packaging manual has now been imported into the
        policy document
 
-
 3.2.1.0                    Aug 00
 
      - A package of priority standard or higher may provide two
        binaries, one compiled with support for the X Window System,
        and the other without [11.8.1]
 
-
 3.2.0.0                    Aug 00
 
      - By default executables should not be built with the debugging
@@ -347,13 +404,11 @@ picking your way through this list.
        always creating the shared lib before the symlink, so the unpack
        order be correct [8]
 
-
 3.1.1.0                    Nov 1999
 
      - Correction to semantics of architecture lists in Build-Depends
        etc.  Should not affect many packages [7.1]
 
-
 3.1.0.0                    Oct 1999
 
      - /usr/doc/<package> has to be a symlink pointing to
@@ -384,14 +439,12 @@ picking your way through this list.
      - Description of how to handle version numbers based on dates
        added [3.2.1]
 
-
 3.0.1.0                    Jul 1999
 
     -  Added the clarification that the .la files are essential for the
        packages using libtool's libltdl library, in which case the
        .la files must go in the run-time library package [10.2]
 
-
 3.0.0.0                    Jun 1999
 
     - Debian formally moves from the FSSTND to the FHS. This is a
diff --git a/virtual-package-names-list.txt b/virtual-package-names-list.txt
index dd7d541..0ec4d1d 100644
--- a/virtual-package-names-list.txt
+++ b/virtual-package-names-list.txt
@@ -1,7 +1,7 @@
 
               AUTHORITATIVE LIST OF VIRTUAL PACKAGE NAMES
 
-                               July 2007
+                              December 2007
 
 
 Below is an authoritative list of virtual package names currently
@@ -139,6 +139,11 @@ X Window System
  xserver                 an X server that (directly or indirectly) manages
                          physical input and display hardware
 
+Fonts
+-----
+ ttf-japanese-gothic     Gothic-style Japanese font
+ ttf-japanese-mincho     Mincho-style Japanese font
+
 Graphics and MultiMedia
 -----------------------
  audio-mixer             a utility to control the input and output levels
@@ -297,3 +302,5 @@ Manoj Srivastava:
 Russ Allbery:
    8 Jul 2007 Added dictd-dictionary
               Rename inetd-superserver to inet-superserver
+   2 Dec 2007 Added ttf-japanese-gothic
+              Added ttf-japanese-mincho
-- 
2.39.2