* Removed defunct virtual package names (closes

Author: jdg
Date: 2001/02/13 12:03:57
* Removed defunct virtual package names (closes: #84641)
* Changed postrm rmdir example so that it survives errors better
(suggested on -policy list)
* Typo cpu -> CPU

git-archimport-id: srivasta@debian.org--etch/debian-policy--devel--3.0--patch-76

diff --git a/debian/changelog b/debian/changelog
index 9416ba7ecf4716a734ca1261009da8723891324f..f02a17f2d3bdb6f401cf726c17ad3fc49e36360b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debian-policy (3.5.0.1) unstable; urgency=low
+
+  * Removed deprecated virtual package names (closes: #84641)
+  * Changed rmdir postrm example (suggestion on -policy list)
+
+ --
+
 debian-policy (3.5.0.0) unstable; urgency=low
 
   * There have been numerous changes since the last major change, and

diff --git a/policy.sgml b/policy.sgml
index 5e3b5cab178ef875d71f72fb071caff17ea315a0..92a9ac184244561211472ea6b919ce12cde97494 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -3810,9 +3810,8 @@
            </example>
            in the <tt>postinst</tt> script, and
            <example>
-             rmdir /usr/local/lib/emacs/site-lisp && \
-             rmdir /usr/local/lib/emacs || \
-             true
+             rmdir /usr/local/lib/emacs/site-lisp || true
+             rmdir /usr/local/lib/emacs || true
            </example>
            in the <tt>prerm</tt> script.</p>
          
@@ -4865,7 +4864,7 @@
                </item>
                <item>
                  <p>
-                   There will be much less wasted cpu time for the
+                   There will be much less wasted CPU time for the
                    autobuilders since not having debugging
                    information (and hence also not having to strip
                    it) will increase the speed of compiles. This

diff --git a/virtual-package-names-list.txt b/virtual-package-names-list.txt
index fdb6d5ba217f1e8cc1efdafff6d5c252dd55abff..4b96a26529f1b3328b3c4fd782c93319176a61ad 100644 (file)
--- a/virtual-package-names-list.txt
+++ b/virtual-package-names-list.txt
@@ -1,7 +1,7 @@
 
               AUTHORITATIVE LIST OF VIRTUAL PACKAGE NAMES
 
-                            October 1999
+                            January 2001
 
 
 Below is an authoritative list of virtual package names currently
@@ -48,7 +48,7 @@ Manoj
 Now, the list:
 
 X Window System
- ---------
+---------------
 x-terminal-emulator     any X client which emulates a terminal with a
                         terminfo description in the ncurses-base package
 x-window-manager        any X client which provides window management
@@ -82,7 +82,6 @@ lambdamoo-core          A lambdamoo-compatible datebase package
 lambdamoo-server        Anything running a moo using a lambdamoo-core
 libc-dev                Anything that provides header and object files
                         of `libc'
-libc.so.4               An a.out shared C library, version 4.x.x.
 man-browser             Anything that can read man pages
 pdf-preview             Any preprocessor that creates PDF output
 pdf-viewer              Anything that can display PDF files
@@ -123,11 +122,7 @@ Old and obsolete virtual package names
 Note, that no other package then the ones listed here should use
 these virtual package names.
 
-X11R5                   provided by xcompat for compatibility reasons
-X11R6                   do.
-xr5shlib                do.
-aout-x11r6lib           do.
-
+[There are currently no such package names in use]
 
 Changelog
 ---------
@@ -177,25 +172,23 @@ Julian Gilbey
               Alphabeticised lists
 
 Manoj Srivastava
-  11 July 2000 Added x-terminal-emulator
-               Added x-window-manager
-               Added xserver
-               Added linux-kernel-log-daemon
-               Added system-log-faemon
+  11 Jul 2000 Added x-terminal-emulator
+              Added x-window-manager
+              Added xserver
+              Added linux-kernel-log-daemon
+              Added system-log-faemon
 
 Manoj Srivastava
-  24 August 2000 Added mp3-encoder
-                 Added mp3-decoder
-                 Added time-daemon
-                 Added rsh-client
-                 Added telnet-client
-Manoj Srivastava
-  16 January 2001 Added rsh server
-                  Added telnet-server
-
-
-
-
-
+  24 Aug 2000 Added mp3-encoder
+              Added mp3-decoder
+              Added time-daemon
+              Added rsh-client
+              Added telnet-client
 
+Manoj Srivastava
+  16 Jan 2001 Added rsh server
+              Added telnet-server
 
+Julian Gilbey
+  13 Feb 2001 Removed libc.4.so
+              Removed xcompat virtual package names