[Pkg-sysvinit-commits] r1461 - sysvinit/trunk/debian

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-14 19:41:16 +0000 (Tue, 14 Jul 2009)
New Revision: 1461

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/control
Log:
Clean up control file, dropping replaces and conflicts on sysvinit
packages before oldstable: sysvinit (<< 2.85-1),
sysv-rc (<< 2.86.ds1-1.2) and sysvinit (<< 2.86.ds1-12).

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-14 19:34:20 UTC (rev 1460)
+++ sysvinit/trunk/debian/changelog	2009-07-14 19:41:16 UTC (rev 1461)
@@ -6,6 +6,9 @@
   * Move bootlogd to the sysvinit-utils package, as it is useful also
     without the sysvinit init program.  Make sysvinit-utils replace
     sysvinit (<= 2.86.ds1-65) to handle this.
+  * Clean up control file, dropping replaces and conflicts on sysvinit
+    packages before oldstable: sysvinit (<< 2.85-1),
+    sysv-rc (<< 2.86.ds1-1.2) and sysvinit (<< 2.86.ds1-12).
 
  -- Petter Reinholdtsen <pere at debian.org>  Mon, 13 Jul 2009 00:19:43 +0200
 

Modified: sysvinit/trunk/debian/control
===================================================================
--- sysvinit/trunk/debian/control	2009-07-14 19:34:20 UTC (rev 1460)
+++ sysvinit/trunk/debian/control	2009-07-14 19:41:16 UTC (rev 1461)
@@ -12,7 +12,7 @@
 Package: sysvinit
 Essential: yes
 Architecture: any
-Pre-Depends: initscripts, sysv-rc (>= 2.86.ds1-1.2) | file-rc (>> 0.7.0), sysvinit-utils
+Pre-Depends: initscripts, sysv-rc | file-rc (>> 0.7.0), sysvinit-utils
 Depends: ${shlibs:Depends}
 Description: System-V-like init utilities
  This package contains programs required for booting
@@ -40,7 +40,7 @@
 Architecture: all
 Recommends: lsb-base (>= 3.0-6)
 Conflicts: file-rc
-Replaces: file-rc, sysvinit (<< 2.85-1)
+Replaces: file-rc
 Suggests: sysv-rc-conf, bum
 Depends: sysvinit-utils (>= 2.86.ds1-62)
 Description: System-V-like runlevel change mechanism
@@ -52,8 +52,8 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${glibc:Depends}, ${mount:Depends}, debianutils (>= 2.13.1), lsb-base (>= 3.0-6), sysvinit-utils (>= 2.86.ds1-39)
 Recommends: psmisc, e2fsprogs
-Conflicts: sysv-rc (<< 2.86.ds1-1.2), sysvinit (<< 2.86.ds1-12), udev (<< 0.080-1), usplash (<< 0.5.8-2), libdevmapper1.02.1 (<< 2:1.02.24-1), insserv (<< 1.09.0-12)
-Replaces: sysvinit (<< 2.85-12), libc6, libc6.1, libc0.1, libc0.3
+Conflicts: udev (<< 0.080-1), usplash (<< 0.5.8-2), libdevmapper1.02.1 (<< 2:1.02.24-1), insserv (<< 1.09.0-12)
+Replaces: libc6, libc6.1, libc0.1, libc0.3
 Description: scripts for initializing and shutting down the system
  The scripts in this package initialize a standard Debian
  GNU/Linux system at boot time and shut it down at halt or