From: Manoj Srivastava Date: Thu, 16 Jun 2005 09:05:22 +0000 (+0000) Subject: Synchronized with patch 122 from Manojs tree X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9445ea231b93b63f16cb148a0ea1458131388079;hp=7d8d8df325a5222735f56c188d895792d7b96ae8;p=debian%2Fdebian-policy.git Synchronized with patch 122 from Manojs tree Synchronized with patch 122 from Manojs tree Patches applied: * srivasta@debian.org--etch/debian-policy--devel--3.0--patch-122 * Improved 10.1.2 example (fixes bug#92744) git-archimport-id: debian-policy@lists.debian.org--etch/debian-policy--devel--3.0--patch-122 --- diff --git a/debian/changelog b/debian/changelog index 66bf042..2559145 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ debian-policy (3.5.4.1) unstable; urgency=low debian/rules to do this * Add patched versions of debiandoc-sgml stuff to source package until patches are incorporated upstream + * Versioned Build-Depend on debiandoc-sgml for fixed Text.pm + * Improved mkdir example in 10.1.2 closes: Bug#92744 -- diff --git a/policy.sgml b/policy.sgml index 432861e..e90c37c 100644 --- a/policy.sgml +++ b/policy.sgml @@ -3209,9 +3209,18 @@ Depends: libc6 (>= 2.2.1), exim | mail-transport-agent Source: glibc Build-Depends-Indep: texinfo Build-Depends: kernel-headers-2.2.10 [!hurd-i386], -hurd-dev [hurd-i386], gnumach-dev [hurd-i386] + hurd-dev [hurd-i386], gnumach-dev [hurd-i386]

+ +

+ Note that the binary package relationship fields such as + Depends appear in one of the binary package + sections of the control file, whereas the build-time + relationships such as Build-Depends appear in the + source package section of the control file (which is the + first section). +

@@ -3222,8 +3231,10 @@ hurd-dev [hurd-i386], gnumach-dev [hurd-i386]

These five fields are used to declare a dependency - relationship by one package on another. They appear in the - depending package's control file. + 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.)

@@ -4225,7 +4236,14 @@ libbar 1 bar1 (>= 1.0-1) For example, the emacsen-common package could contain something like -mkdir -p /usr/local/share/emacs/site-lisp || true +if [ ! -e /usr/local/share/emacs ] +then + if mkdir /usr/local/share/emacs 2>/dev/null + then + chown root:staff /usr/local/share/emacs + chmod 2775 /usr/local/share/emacs + fi +fi in its postinst script, and diff --git a/upgrading-checklist.html b/upgrading-checklist.html index bb81e6b..7e27c66 100644 --- a/upgrading-checklist.html +++ b/upgrading-checklist.html @@ -54,7 +54,7 @@ picking your way through this list. 

 3.5.4.0                    Apr 01
-  Policy Manual:
+
      - The system-wide mail directory is now /var/mail, no longer
        /var/spool/mail.  Any packages accessing the mail spool should
        access it via /var/mail and include a suitable Depends field;
@@ -65,36 +65,35 @@ picking your way through this list.
 
 
 3.5.3.0                    Apr 01
-  Policy Manual:
+
      - Build-Depends arch syntax has been changed to be less
        ambiguous. This should not affect any current packages [7.1]
-     - Examples and templates should now live in
-       /usr/share/<package> or /usr/lib/<package>, with
+     - Examples and templates files for use by scripts should now live
+       in /usr/share/<package> or /usr/lib/<package>, with
        symbolic links from /usr/share/doc//<package>/examples as
        needed [11.7.3]
 
 
 3.5.2.0                    Feb 01
-  Policy Manual:
+
      - X app-defaults directory has moved from
-      /usr/X11R6/lib/X11/app-defaults to /etc/X11/app-defaults [12.8]
+       /usr/X11R6/lib/X11/app-defaults to /etc/X11/app-defaults [12.8]
 
 
 3.5.1.0                    Feb 01
-  Policy Manual:
+
      - dpkg-shlibdeps now uses objdump, so shared libraries have to be
        run through dpkg-shlibdeps as well as executables [9.1]
 
 
 3.5.0.0                    Jan 01
-  Policy Manual:
+
      - Font packages for the X Window System must now declare a
        dependency on xutils (>= 4.0.2) [12.8]
 
 
 3.2.1.1                    Jan 01
 
-  Policy Manual:
      - Daemon startup scripts in /etc/init.d/ should not contain
        modifiable parameters; these should be moved to a file in
       /etc/default/; see [10.3.2] for details
@@ -179,7 +178,6 @@ picking your way through this list.
 
 3.0.1.0                    Jul 99
 
-  Policy Manual:
     -  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 [11.2]
@@ -187,7 +185,6 @@ picking your way through this list.
 
 3.0.0.0                    Jun 99
 
-  Policy Manual:
     - Debian formally moves from the FSSTND to the FHS. This is a
       major change, and the implications of this move are probably
       not all known. [10.1]