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

[pere at alioth.debian.org]

Author: pere
Date: 2007-12-02 09:11:41 +0000 (Sun, 02 Dec 2007)
New Revision: 1077

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/control
Log:
Make initscripts conflictwith usplash (<< 0.5) to make sure a version with PULSATE support is used.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2007-12-01 15:52:12 UTC (rev 1076)
+++ sysvinit/trunk/debian/changelog	2007-12-02 09:11:41 UTC (rev 1077)
@@ -27,7 +27,9 @@
   * Add splash screen / progress bar API to initscripts in
     /lib/init/splash-functions-base, overridable by the splash
     implementations in /lib/init/splash-functions.  Based on patch
-    from David Härdeman. (Closes: #423095)
+    from David Härdeman. (Closes: #423095)  Make initscripts conflict
+    with usplash (<< 0.5) to make sure a version with PULSATE support
+    is used.
   * Rewrite init.d/rc progress bar support to use new API.  Move
     usplash calls to separate file splash-functions-usplash.  This
     file should be moved to the usplash package. Based on patch from

Modified: sysvinit/trunk/debian/control
===================================================================
--- sysvinit/trunk/debian/control	2007-12-01 15:52:12 UTC (rev 1076)
+++ sysvinit/trunk/debian/control	2007-12-02 09:11:41 UTC (rev 1077)
@@ -48,7 +48,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${glibc:Depends}, ${mount:Depends}, e2fsprogs (>= 1.32+1.33-WIP-2003.04.14-1), debianutils (>= 2.13.1), lsb-base (>= 3.0-6), sysvinit-utils (>= 2.86.ds1-39)
 Recommends: psmisc
-Conflicts: mdutils, sysv-rc (<< 2.86.ds1-1.2), sysvinit (<< 2.86.ds1-12), udev (<< 0.080-1)
+Conflicts: mdutils, sysv-rc (<< 2.86.ds1-1.2), sysvinit (<< 2.86.ds1-12), udev (<< 0.080-1), usplash (<< 0.5)
 Replaces: mdutils, sysvinit (<< 2.85-12), 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