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

[Petter Reinholdtsen]

Author: pere
Date: 2009-08-26 17:34:34 +0000 (Wed, 26 Aug 2009)
New Revision: 1642

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/control
Log:
Drop initscripts conflict on usplash (<< 0.5.8-2), which was
before stable was released.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-08-26 17:32:16 UTC (rev 1641)
+++ sysvinit/trunk/debian/changelog	2009-08-26 17:34:34 UTC (rev 1642)
@@ -76,6 +76,8 @@
     sysv-rc depend on insserv (>> 1.12.0-10).
   * Drop initscripts conflict on udev (<< 0.080-1), which was
     before oldstable was released.
+  * Drop initscripts conflict on usplash (<< 0.5.8-2), which was
+    before stable was released.
 
  -- Kel Modderman <kel at otaku42.de>  Sun, 02 Aug 2009 05:46:21 +1000
 

Modified: sysvinit/trunk/debian/control
===================================================================
--- sysvinit/trunk/debian/control	2009-08-26 17:32:16 UTC (rev 1641)
+++ sysvinit/trunk/debian/control	2009-08-26 17:34:34 UTC (rev 1642)
@@ -53,7 +53,7 @@
 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: usplash (<< 0.5.8-2), libdevmapper1.02.1 (<< 2:1.02.24-1)
+Conflicts: libdevmapper1.02.1 (<< 2:1.02.24-1)
 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