From: Manoj Srivastava Date: Mon, 7 Sep 2009 20:31:00 +0000 (-0500) Subject: Merge branch 'master' into srivasta X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=10f927594e0ddeffc217e675cbd16f380be2da4f;hp=ccdf0b98f5cfc0a9433d5b5025ce80e914abe91a;p=debian%2Fdebian-policy.git Merge branch 'master' into srivasta --- diff --git a/Makefile b/Makefile index efb5b7b..1d0852e 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,11 @@ mime-policy.sgml: version.ent %.html/index.html: %.sgml LANG=C debiandoc2html $< +%-1.html: %.sgml + LANG=C debiandoc2html -1 -b $*-1d $< && \ + mv $*-1d.html/index.html $*-1.html && \ + rmdir $*-1d.html + %.html.tar.gz: %.html/index.html tar -czf $(<:/index.html=.tar.gz) $(<:/index.html=) @@ -33,6 +38,7 @@ mime-policy.sgml: version.ent # convenience aliases :) html: policy.html/index.html +html-1: policy-1.html txt text: policy.txt ps: policy.ps pdf: policy.pdf diff --git a/debian/changelog b/debian/changelog index 589f711..6da7e5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,93 @@ -debian-policy (3.8.2.0) UNRELEASED; urgency=low +debian-policy (3.8.3.1) unstable; urgency=low + + * Also provide documents in single-file HTML format. + Proposed by Jari Aalto. + Closes: #544353 + + -- Bill Allombert Fri, 04 Sep 2009 14:32:42 +0200 + +debian-policy (3.8.3.0) unstable; urgency=low + + * Policy: Bring Architecture description in line with dpkg-source + Wording: Russ Allbery + Seconded: Raphael Hertzog + Seconded: Manoj Srivastava + Closes: #530967 + * Policy: Update information about DEB_*_ARCH variables + Wording: Guillem Jover + Seconded: Russ Allbery + Seconded: Andrew McMillan + Closes: #527871 + * Policy: Remove support for uploads to multiple distributions + Wording: Russ Allbery + Seconded: Raphael Hertzog + Seconded: Manoj Srivastava + Closes: #514919 + * Policy: Remove permission for packages to modify ld.so.conf + Wording: Steve Langasek + Seconded: Russ Allbery + Seconded: Kurt Roeckx + Seconded: Adeodato Simó + Seconded: Julien Cristau + Closes: #519941 + * Policy: Clarify X installation directory handling + Wording: Russ Allbery + Seconded: Julien Cristau + Seconded: Manoj Srivastava + Seconded: Raphaël Hertzog + Closes: #522217 + * Policy: Localized man pages should be up-to-date or warn + Wording: Russ Allbery + Seconded: Julien Cristau + Seconded: Raphaël Hertzog + Closes: #493007 + * Policy: Remove restriction on manual page character encoding + Wording: Colin Watson + Seconded: Russ Allbery + Seconded: Manoj Srivastava + Closes: #537707 + * Policy: Allow Binary field to span multiple lines + Wording: Russ Allbery + Seconded: Julien Cristau + Seconded: Guillem Jover + Closes: #533852 + * Policy: Revise info requirements for triggerized install-info + Wording: Russ Allbery + Seconded: Guillem Jover + Seconded: Raphaël Hertzog + Closes: #538665 + * Perl Policy: Remove obsolete dependency requirements + Wording: Cyril Brulebois + Seconded: Russ Allbery + Seconded: Manoj Srivastava + Closes: #525190 + * Breaks is now supported by the stable release of dpkg, so drop + warnings against its use. Thanks, Steve Langasek. (Closes: #533577) + * Add references to the sections on Breaks and Conflicts to the section + on binary dependencies. Thanks, Frank Küster. (Closes: #529771) + * Clarify the units of Installed-Size and document that it is an + approximation. Thanks, Martin Dorey. (Closes: #534408) + * Don't suggest calling dpkg-statoverride --remove unconditionally in + the postrm script. Thanks, Patrick Schoenfeld. (Closes: #539389) + * Explain that the copyright dates are for the original Policy manual + and that there is no updated list of copyright holders for subsequent + revisions available. (Partly addresses #47438) + * Clarify the description of the Files control field and add examples. + * Change the wording of the Description and Changes field specifications + for *.changes files to more closely match the wording for Files and + add more details about the contents of the Description field in + a *.changes file. + * Merge the package name syntax requirements between the Package and + Source field descriptions. + * Say that sensible-editor and sensible-pager are provided by the + sensible-utils package, not by the base system. Thanks, Clint Adams + and Steve Langasek. (Closes: #541537) + * Document that control field values are case-sensitive unless the field + description says otherwise. + + -- Russ Allbery Sat, 15 Aug 2009 17:13:26 -0700 + +debian-policy (3.8.2.0) unstable; urgency=low [ Russ Allbery ] * Policy: Mandate debconf or equivalent for user prompting @@ -35,6 +124,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 Seconded: Russ Allbery @@ -42,7 +132,15 @@ debian-policy (3.8.2.0) UNRELEASED; urgency=low Closes: #525151 * Add myself to Uploaders. - -- Russ Allbery 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 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 247b0e7..7f3c69c 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: debian-policy Section: doc Priority: optional Maintainer: Debian Policy List -Uploaders: Manoj Srivastava , Russ Allbery , Colin Watson -Standards-Version: 3.8.0 +Uploaders: Manoj Srivastava , Russ Allbery , Colin Watson , Bill Allombert +Standards-Version: 3.8.3 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 f3f3b76..07e635e 100755 --- 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: //') @@ -55,6 +55,7 @@ FILES_TO_CLEAN = debian/files debian/buildinfo debian/substvars \ debian/postinst debian/prerm \ version.ent upgrading-checklist.txt \ $(SGML_FILES:=.txt.gz) $(SGML_FILES:=.html.tar.gz) \ + $(SGML_FILES:=-1.html) \ policy.pdf.gz policy.ps.gz \ debconf_specification.xml.tar.gz \ policy.pdf policy.ps policy.txt policy. \ @@ -73,6 +74,7 @@ all build: stamp-build stamp-build: version.ent $(sanitycheck) $(MAKE) $(SGML_FILES:=.sgml.validate) \ $(SGML_FILES:=.html.tar.gz) \ + $(SGML_FILES:=-1.html) \ $(SGML_FILES:=.txt.gz) \ policy.ps.gz policy.pdf.gz links -dump upgrading-checklist.html | perl -pe 's/[\r\0]//g' > \ @@ -139,10 +141,14 @@ stamp-policy: build $(sanitycheck) for file in $(SGML_FILES); do \ tar -C $(DOCDIR) -zxf $$file.html.tar.gz; \ done + for file in $(SGML_FILES); do \ + $(install_file) $${file}-1.html $(DOCDIR); \ + done $(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/perl-policy.sgml b/perl-policy.sgml index 1421b46..1d26df7 100644 --- a/perl-policy.sgml +++ b/perl-policy.sgml @@ -319,10 +319,6 @@ $(MAKE) install PREFIX=$(CURDIR)/debian/<tmp>/usr (nominally just tmp)

-

- A Build-Depends on perl (>= 5.6.0-16) is - required. -

@@ -342,13 +338,6 @@ $(MAKE) install PREFIX=$(CURDIR)/debian/<tmp>/usr the minimum required version, or more simply the current version.

-

- In the absence of an explicit requirement, - architecture-independent modules must depend on a minimum - perl or perl-base - version of 5.6.0-16 due to the changes in - @INC introduced by that version. -

diff --git a/policy.sgml b/policy.sgml index 144cbfb..0bf8253 100644 --- a/policy.sgml +++ b/policy.sgml @@ -24,6 +24,13 @@ Copyright © 1996,1997,1998 Ian Jackson and Christian Schwarz. +

+ These are the copyright dates of the original Policy manual. + Since then, this manual has been updated by many others. No + comprehensive collection of copyright notices for subsequent + work exists. +

+

This manual is free software; you may redistribute it and/or modify it under the terms of the GNU General Public License @@ -1985,6 +1992,12 @@ DEB_*_ARCH (the Debian architecture) + + DEB_*_ARCH_CPU (the Debian CPU name) + + + DEB_*_ARCH_OS (the Debian System name) + DEB_*_GNU_TYPE (the GNU style architecture specification string) @@ -2013,8 +2026,10 @@ It is important to understand that the DEB_*_ARCH string only determines which Debian architecture we are building on or for. It should not be used to get the CPU - or system information; the GNU style variables should be - used for that. + or system information; the DEB_*_ARCH_CPU and + DEB_*_ARCH_OS variables should be used for that. + GNU style variables should generally only be used with upstream + build systems.

@@ -2364,6 +2379,8 @@ Package: libc6

Field names are not case-sensitive, but it is usual to capitalize the field names using mixed case as shown below. + Field values are case-sensitive unless the description of the + field says otherwise.

@@ -2590,11 +2607,12 @@ Package: libc6

- 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. + Package names (both source and binary, + see ) 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.

@@ -2693,11 +2711,9 @@ Package: libc6

- 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. + Binary package names must follow the same syntax and + restrictions as source package names. See + for the details.

@@ -2710,7 +2726,7 @@ Package: libc6 values: A unique single word identifying a Debian machine - architecture, see . + architecture as described in . all, which indicates an architecture-independent package. any, which indicates a package available @@ -2721,31 +2737,53 @@ Package: libc6

In the main debian/control file in the source - package, or in the source package control file - .dsc, one may specify a list of architectures - separated by spaces, or the special values any or - all. + package, this field may contain the special value + any, the special value all, or a list of + architectures separated by spaces. If any or + all appear, they must be the entire contents of the + field. Most packages will use either any or + all. Specifying a specific list of architectures is + for the minority of cases where a program is not portable or + is not useful on some architectures, and where possible the + program should be made portable instead. +

+ +

+ In the source package control file .dsc, this + field may contain either the special value any or a + list of architectures separated by spaces. If a list is given, + it may include (or consist solely of) the special value + all. In other words, in .dsc files + unlike the debian/control, all may occur + in combination with specific architectures. The + Architecture field in the source package control file + .dsc is generally constructed from the + Architecture fields in the + debian/control in the source package.

Specifying any indicates that the source package isn't dependent on any particular architecture and should compile fine on any one. The produced binary package(s) - will be specific to whatever the current build architecture - is. - This is the most often used setting, and is recommended - for new packages that aren't Architecture: all. - + will either be specific to whatever the current build + architecture is or will be architecture-independent. +

+ +

+ Specifying only all indicates that the source package + will only build architecture-independent packages. If this is + the case, all must be used rather than any; + any implies that the source package will build at + least one architecture-dependent package.

Specifying a list of architectures indicates that the source will build an architecture-dependent package, and will only - work correctly on the listed architectures. - This is a setting used for a minority of cases where the - program is not portable. Generally, it should not be used - for new packages. - + work correctly on the listed architectures. If the source + package also builds at least one architecture-independent + package, all will also be included in the list.

@@ -2753,7 +2791,11 @@ Package: libc6 field lists the architecture(s) of the package(s) currently being uploaded. This will be a list; if the source for the package is also being uploaded, the special - entry source is also present. + entry source is also present. all will be + present if any architecture-independent packages are being + uploaded. any may never occur in the + Architecture field in the .changes + file.

@@ -3061,18 +3103,16 @@ Package: libc6

- In a .changes file, the Description field - contains a summary of the descriptions for the packages being - uploaded. + In a .changes file, the Description + field contains a summary of the descriptions for the packages + being uploaded. For this case, the first line of the field + value (the part on the same line as Description:) is + always empty. The content of the field is expressed as + continuation lines, one line per package. Each line is + indented by one space and contains the name of a binary + package, a space, a hyphen (-), a space, and the + short description line from that package.

- -

- The part of the field before the first newline is empty; - thereafter each line has the name of a binary package and - the summary description line from that binary package. - Each line is indented by one space. -

- @@ -3084,76 +3124,39 @@ Package: libc6 distribution(s) where this version of the package should be installed. Valid distributions are determined by the archive maintainers. - Current distribution names are: + Example distribution names in the Debian archive used in + .changes files are: - stable - - This is the current "released" version of Debian - GNU/Linux. Once the distribution is - stable only security fixes and other - major bug fixes are allowed. When changes are - made to this distribution, the release number is - increased (for example: 2.2r1 becomes 2.2r2 then - 2.2r3, etc). - - unstable - This distribution value refers to the - developmental part of the Debian - distribution tree. New packages, new upstream - versions of packages and bug fixes go into the - unstable directory tree. Download from - this distribution at your own risk. - - - testing - - This distribution value refers to the - testing part of the Debian distribution - tree. It receives its packages from the - unstable distribution after a short time lag to - ensure that there are no major issues with the - unstable packages. It is less prone to breakage - than unstable, but still risky. It is not - possible to upload packages directly to - testing. - - - frozen - - From time to time, the testing - distribution enters a state of "code-freeze" in - anticipation of release as a stable - version. During this period of testing only - fixes for existing or newly-discovered bugs will - be allowed. The exact details of this stage are - determined by the Release Manager. + This distribution value refers to the + developmental part of the Debian distribution + tree. Most new packages, new upstream versions of + packages and bug fixes go into the unstable + directory tree. experimental - The packages with this distribution value are - deemed by their maintainers to be high - risk. Oftentimes they represent early beta or - developmental packages from various sources that - the maintainers want people to try, but are not - ready to be a part of the other parts of the - Debian distribution tree. Download at your own - risk. + The packages with this distribution value are deemed + by their maintainers to be high risk. Oftentimes they + represent early beta or developmental packages from + various sources that the maintainers want people to + try, but are not ready to be a part of the other parts + of the Debian distribution tree.

- You should list all distributions that the - package should be installed into. -

- -

- More information is available in the Debian Developer's - Reference, section "The Debian archive". + Others are used for updating stable releases or for + security uploads. More information is available in the + Debian Developer's Reference, section "The Debian + archive".

+ The Debian archive software only supports listing a single + distribution. Migration of packages to other distributions is + handled outside of the upload process.

@@ -3226,10 +3229,12 @@ Package: libc6

- There should be nothing in this field before the first - newline; all the subsequent lines must be indented by at - least one space; blank lines must be represented by a line - consisting only of a space and a full stop. + The first line of the field value (the part on the same line + as Changes:) is always empty. The content of the + field is expressed as continuation lines, with each line + indented by at least one space. Blank lines must be + represented by a line consisting only of a space and a full + stop (.).

@@ -3257,29 +3262,27 @@ Package: libc6 Binary

- This field is a list of binary packages. + This field is a list of binary packages. Its syntax and + meaning varies depending on the control file in which it + appears.

- When it appears in the .dsc file it is the list - of binary packages which a source package can produce. It - does not necessarily produce all of these binary packages - for every architecture. The source control file doesn't - contain details of which architectures are appropriate for - which of the binary packages. -

- -

- When it appears in a .changes file it lists the - names of the binary packages actually being uploaded. + When it appears in the .dsc file, it lists binary + packages which a source package can produce, separated by + commas + A space after each comma is conventional. + . It may span multiple lines. The source package + does not necessarily produce all of these binary packages for + every architecture. The source control file doesn't contain + details of which architectures are appropriate for which of + the binary packages.

- The syntax is a list of binary packages separated by - commas - A space after each comma is conventional. - . Currently the packages must be separated using - only spaces in the .changes file. + When it appears in a .changes file, it lists the + names of the binary packages being uploaded, separated by + whitespace (not commas). It may span multiple lines.

@@ -3287,15 +3290,17 @@ Package: libc6 Installed-Size

- This field appears in the control files of binary - packages, and in the Packages files. It gives - the total amount of disk space required to install the - named package. + This field appears in the control files of binary packages, + and in the Packages files. It gives an estimate + of the total amount of disk space required to install the + named package. Actual installed size may vary based on block + size, file system properties, or actions taken by package + maintainer scripts.

- The disk space is represented in kilobytes as a simple - decimal number. + The disk space is given as the integer value of the estimated + installed size in bytes, divided by 1024 and rounded up.

@@ -3305,20 +3310,30 @@ Package: libc6

This field contains a list of files with information about each one. The exact information and syntax varies with - the context. In all cases the part of the field - contents on the same line as the field name is empty. The - remainder of the field is one line per file, each line - being indented by one space and containing a number of - sub-fields separated by spaces. + the context. +

+ +

+ In all cases, Files is a multiline field. The first line of + the field value (the part on the same line as Files:) + is always empty. The content of the field is expressed as + continuation lines, one line per file. Each line must be + indented by one space and contain a number of sub-fields, + separated by spaces, as described below.

In the .dsc file, each line contains the MD5 - checksum, size and filename of the tar file and (if applicable) - diff file which make up the remainder of the source - package - That is, the parts which are not the .dsc. - . + checksum, size and filename of the tar file and (if + applicable) diff file which make up the remainder of the + source package + That is, the parts which are not the .dsc. + . For example: + +Files: + c6f698f19f2a2aa07dbb9bbda90a2754 571925 example_1.2.orig.tar.gz + 938512f08422f3509ff36f125f5873ba 6220 example_1.2-1.diff.gz + The exact forms of the filenames are described in .

@@ -3326,14 +3341,20 @@ Package: libc6

In the .changes file this contains one line per file being uploaded. Each line contains the MD5 checksum, - size, section and priority and the filename. + size, section and priority and the filename. For example: + +Files: + 4c31ab7bfc40d3cf49d7811987390357 1428 text extra example_1.2-1.dsc + c6f698f19f2a2aa07dbb9bbda90a2754 571925 text extra example_1.2.orig.tar.gz + 938512f08422f3509ff36f125f5873ba 6220 text extra example_1.2-1.diff.gz + 7c98fe853b3bbb47a00e5cd129b6cb56 703542 text extra example_1.2-1_i386.deb + The section - and priority - are the values of the corresponding fields in - the main source control file. If no section or priority is - specified then - should be used, though section - and priority values must be specified for new packages to - be installed properly. + and priority are the values of + the corresponding fields in the main source control file. If + no section or priority is specified then - should be + used, though section and priority values must be specified for + new packages to be installed properly.

@@ -4255,6 +4276,9 @@ Build-Depends: foo [!i386] | bar [!amd64] This is done using the Depends, Pre-Depends, Recommends, Suggests, Enhances, Breaks and Conflicts control file fields. + Breaks is described in , and + Conflicts is described in . The + rest are described below.

@@ -4442,12 +4466,6 @@ Build-Depends: foo [!i386] | bar [!amd64] 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 @@ -4532,8 +4550,7 @@ Build-Depends: foo [!i386] | bar [!amd64] 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. Instead, - Breaks may be used (once Breaks is supported - by the stable release of Debian). + Breaks may be used.

@@ -6377,10 +6394,10 @@ echo "Setting DNS domainname to \"$domainname\"."

- Note that the same symbol (") is used for the left - and right quotation marks. A grave accent (`) is - not a quote character; neither is an apostrophe - ('). + Note that the same symbol (") is used + for the left and right quotation marks. A grave accent + (`) is not a quote character; neither is an + apostrophe (').

@@ -6980,17 +6997,6 @@ strip --strip-unneeded your-lib

-

- Packages containing shared libraries that may be linked to - by other packages' binaries, but which for some - compelling reason can not be installed in - /usr/lib directory, may install the shared library - files in subdirectories of the /usr/lib directory, - in which case they should arrange to add that directory in - /etc/ld.so.conf in the package's post-installation - script, and remove it in the package's post-removal script. -

-

An ever increasing number of packages are using libtool to do their linking. The latest GNU @@ -7772,9 +7778,17 @@ do fi done - The corresponding dpkg-statoverride --remove - calls can then be made unconditionally when the package is - purged. + The corresponding code to remove the override when the package + is purged would be: + +for i in /usr/bin/foo /usr/sbin/bar +do + if dpkg-statoverride --list $i >/dev/null 2>&1 + then + dpkg-statoverride --remove $i + fi +done +

@@ -7942,10 +7956,10 @@ done use /usr/bin/sensible-editor and /usr/bin/sensible-pager as the editor or pager program respectively. These are two scripts provided in the - Debian base system that check the EDITOR and PAGER variables - and launch the appropriate program, and fall back to - /usr/bin/editor and /usr/bin/pager if the - variable is not set. + sensible-utils package that check the EDITOR + and PAGER variables and launch the appropriate program, and fall + back to /usr/bin/editor + and /usr/bin/pager if the variable is not set.

@@ -8543,7 +8557,7 @@ name ["syshostname"]:

- + Application defaults files

@@ -8576,54 +8590,35 @@ name ["syshostname"]: Installation directory issues

- Packages using the X Window System should not be - configured to install files under the - /usr/X11R6/ directory. The - /usr/X11R6/ directory hierarchy should be + Historically, packages using the X Window System used a + separate set of installation directories from other packages. + This practice has been discontinued and packages using the X + Window System should now generally be installed in the same + directories as any other package. Specifically, packages must + not install files under the /usr/X11R6/ directory + and the /usr/X11R6/ directory hierarchy should be regarded as obsolete.

- Programs that use GNU autoconf and - automake are usually easily configured at - compile time to use /usr/ instead of - /usr/X11R6/, and this should be done whenever - possible. Configuration files for window managers and - display managers should be placed in a subdirectory of - /etc/X11/ corresponding to the package name due - to these programs' tight integration with the mechanisms - of the X Window System. Application-level programs should - use the /etc/ directory unless otherwise mandated - by policy. + Include files previously installed under + /usr/X11R6/include/X11/ should be installed into + /usr/include/X11/. For files previously + installed into subdirectories of + /usr/X11R6/lib/X11/, package maintainers should + determine if subdirectories of /usr/lib/ and + /usr/share/ can be used. If not, a subdirectory + of /usr/lib/X11/ should be used.

- The installation of files into subdirectories - of /usr/X11R6/include/X11/ and - /usr/X11R6/lib/X11/ is now prohibited; - package maintainers should determine if subdirectories of - /usr/lib/ and /usr/share/ can be used - instead. -

- -

- Packages should install any relevant files into the - directories /usr/include/X11/ and - /usr/lib/X11/, but if they do so, they must - pre-depend on x11-common (>= - 1:7.0.0) -

- These libraries used to be all symbolic - links. However, with X11R7, - /usr/include/X11 and /usr/lib/X11 - are now real directories, and packages - should ship their files here instead - of in /usr/X11R6/{include,lib}/X11. - x11-common (>= 1:7.0.0) is the package - responsible for converting these symlinks into - directories. -

- + Configuration files for window, display, or session managers + or other applications that are tightly integrated with the X + Window System may be placed in a subdirectory + of /etc/X11/ corresponding to the package name. + Other X Window System applications should use + the /etc/ directory unless otherwise mandated by + policy (such as for ).

@@ -8848,12 +8843,12 @@ name ["syshostname"]:

- 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 - . + If a localized version of a manual page is provided, it should + either be up-to-date or it should be obvious to the reader that + it is outdated and the original manual page should be used + instead. This can be done either by a note at the beginning of + the manual page or by showing the missing or changed portions in + the original language instead of the target language.

@@ -8866,37 +8861,53 @@ name ["syshostname"]:

- Your package should call install-info to update - the Info dir file in its postinst - script when called with a configure argument, for - example: - -install-info --quiet --section Development Development \ - /usr/share/info/foobar.info -

- -

- It is a good idea to specify a section for the location of - your program; this is done with the --section - switch. To determine which section to use, you should look - at /usr/share/info/dir on your system and choose the most - relevant (or create a new section if none of the current - sections are relevant). Note that the --section - flag takes two arguments; the first is a regular expression - to match (case-insensitively) against an existing section, - the second is used when creating a new one.

- -

- You should remove the entries in the prerm - script when called with a remove argument: - -install-info --quiet --remove /usr/share/info/foobar.info -

- -

- If install-info cannot find a description entry - in the Info file you must supply one. See for details.

+ The install-info program maintains a directory of + installed info documents in /usr/share/info/dir for + the use of info readers. + It was previously necessary for packages installing info + documents to run install-info from maintainer + scripts. This is no longer necessary. The installation + system now uses dpkg triggers. + + This file must not be included in packages. Packages containing + info documents should depend on dpkg (>= 1.15.4) | + install-info to ensure that the directory file is properly + rebuilt during partial upgrades from Debian 5.0 (lenny) and + earlier. +

+ +

+ Info documents should contain section and directory entry + information in the document for the use + of install-info. The section should be specified + via a line starting with INFO-DIR-SECTION followed by a + space and the section of this info page. The directory entry or + entries should be included between + a START-INFO-DIR-ENTRY line and + an END-INFO-DIR-ENTRY line. For example: + +INFO-DIR-SECTION Individual utilities +START-INFO-DIR-ENTRY +* example: (example). An example info directory entry. +END-INFO-DIR-ENTRY + + To determine which section to use, you should look + at /usr/share/info/dir on your system and choose + the most relevant (or create a new section if none of the + current sections are relevant). + Normally, info documents are generated from Texinfo source. + To include this information in the generated info document, if + it is absent, add commands like: + +@dircategory Individual utilities +@direntry +* example: (example). An example info directory entry. +@end direntry + + to the Texinfo source of the document and ensure that the info + documents are rebuilt from source during the package build. + +

diff --git a/upgrading-checklist.html b/upgrading-checklist.html index c451890..11e81c4 100644 --- a/upgrading-checklist.html +++ b/upgrading-checklist.html @@ -41,7 +41,38 @@ picking your way through this list.

The checklist

-3.8.2.0                        unreleased
+3.8.3.0                        Aug 2009
+
+     * Add DEB_*_ARCH_CPU and DEB_*_ARCH_OS variables and recommend them
+       over GNU-style variables for that information.            [4.9]
+     * Source package Architecture fields may contain "all" in combination
+       with other architectures.  Clarify when "all" and "any" may be used
+       in different versions of the field.                       [5.6.8]
+     * The Debian archive software does not support uploading to multiple
+       distributions with one *.changes file.                    [5.6.14]
+     * The Binary field may span multiple lines.                 [5.6.19]
+     * Remove the permission for shared library packages to install
+       libraries in a non-standard location and modify ld.so.conf.
+       Packages should either be installed in a standard library directory
+       or packages using them should be built with RPATH.        [10.2]
+     * Clarify installation directories for X programs and remove the
+       requirement to pre-depend on x11-common before installing into
+       /usr/include/X11 and /usr/lib/X11.                        [11.8.7]
+     * Remove the requirement that all characters in a manual page be
+       representable in the legacy encoding for that language.   [12.1]
+     * Localized man pages should either be kept up-to-date with the
+       original version or warn that they're not up-to-date, either with
+       warning text or by showing missing or changed portions in the
+       original language.                                        [12.1]
+     * install-info is now handled via triggers so packages no longer need
+       to invoke it in maintainer scripts.  Info documents should now have
+       directory sections and entries in the document.  Packages
+       containing info documents should add a dependency to support
+       partial upgrades.                                         [12.2]
+     * The requirement for Perl modules to have a versioned Depend and
+       Build-Depend on perl >= 5.6.0-16 has been removed.        [perl]
+
+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 +81,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 +91,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