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

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-05 20:38:39 +0000 (Tue, 05 Sep 2006)
New Revision: 834

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/control
   sysvinit/trunk/debian/rules
Log:
Undo sysvutils while we investigate the upgrade problems I ran into.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-05 14:46:39 UTC (rev 833)
+++ sysvinit/trunk/debian/changelog	2006-09-05 20:38:39 UTC (rev 834)
@@ -22,9 +22,6 @@
     distributions.  Patch from Fabio M. Di Nitto via Ubuntu.  Modified to
     not print messages when VERBOSE=no.
   * Drop and remove /etc/init.d/mountvirtfs.  It is obsolete.
-  * Split killall5, last, lastb, mesg and pidof out of the sysvinit
-    package into a new sysvutils package to make it easier to replace
-    init. (Closes: #385722)
   * Do not try to mount netdev file systems in mountall.sh.
     (Closes: #383073, #386063)
   * Mount netdev file systems when the network interfaces are enabled.

Modified: sysvinit/trunk/debian/control
===================================================================
--- sysvinit/trunk/debian/control	2006-09-05 14:46:39 UTC (rev 833)
+++ sysvinit/trunk/debian/control	2006-09-05 20:38:39 UTC (rev 834)
@@ -9,7 +9,9 @@
 Package: sysvinit
 Essential: yes
 Architecture: any
-Pre-Depends: initscripts, sysv-rc (>= 2.86.ds1-1.2) | file-rc (>> 0.7.0), sysvutils
+Conflicts: last
+Replaces: last
+Pre-Depends: initscripts, sysv-rc (>= 2.86.ds1-1.2) | file-rc (>> 0.7.0)
 Depends: ${shlibs:Depends}
 Description: System-V-like init utilities
  This package contains programs required for booting
@@ -20,18 +22,6 @@
  to run as process number 1 until the system halts. All
  other processes are descended from it.
 
-Package: sysvutils
-Essential: yes
-Architecture: any
-Conflicts: last
-Replaces: last, sysvinit (<< 2.86.ds1-15)
-Depends: ${shlibs:Depends}
-Description: System-V-like utilities
- This package contains the important System-V-like utilities.
- .
- Specifically, this package includes:
- killall5, last, lastb, mesg, pidof
-
 Package: sysv-rc
 Architecture: all
 Conflicts: file-rc
@@ -44,7 +34,7 @@
 
 Package: initscripts
 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), sysvutils
+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)
 Conflicts: mdutils, sysv-rc (<< 2.86.ds1-1.2), sysvinit (<< 2.86.ds1-12)
 Replaces: mdutils, sysvinit (<< 2.85-12), libc6, libc6.1, libc0.1, libc0.3
 Description: Scripts for initializing and shutting down the system

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2006-09-05 14:46:39 UTC (rev 833)
+++ sysvinit/trunk/debian/rules	2006-09-05 20:38:39 UTC (rev 834)
@@ -96,22 +96,8 @@
 	rm -f $(tmp)/sbin/halt
 	rm -f $(tmp)/sbin/reboot
 endif
-	rm -f $(tmp)/usr/share/man/man8/killall5.8
-	rm -f $(tmp)/usr/share/man/man1/last.1
-	rm -f $(tmp)/usr/share/man/man1/lastb.1
-	rm -f $(tmp)/usr/share/man/man1/mesg.1
-	rm -f $(tmp)/usr/share/man/man8/pidof.8
 	rm -f $(tmp)/usr/share/man/man1/mountpoint.1
-	rm -f $(tmp)/sbin/killall5
-	rm -f $(tmp)/usr/bin/last
-	rm -f $(tmp)/usr/bin/lastb
-	rm -f $(tmp)/usr/bin/mesg
-	rm -f $(tmp)/bin/pidof
 	rm -f $(tmp)/bin/mountpoint
-	rmdir $(tmp)/usr/share/man/man1
-	rmdir $(tmp)/usr/sbin
-	rmdir $(tmp)/usr/bin
-	rmdir $(tmp)/bin
 	gzip -9f $(tmp)/usr/share/man/man*/*.[0-9]
 	install -o root -g root -m 644 debian/copyright \
 	  $(tmp)$(doc)/sysvinit/copyright
@@ -122,43 +108,6 @@
 	dpkg --build $(tmp) ..
 	rm -rf $(tmp)
 	#
-	# sysvutils package
-	#
-	-rm -rf $(tmp)
-	install -d -o root -g root -m 755 $(tmp)
-	install -d -o root -g root -m 755 $(tmp)/DEBIAN
-	install -d -o root -g root -m 755 $(tmp)$(doc)/sysvutils
-	install -o root -g root -m 644 doc/Changelog \
-		$(tmp)$(doc)/sysvutils/changelog
-	install -o root -g root -m 644 debian/changelog \
-		$(tmp)$(doc)/sysvutils/changelog.Debian
-	gzip -9f $(tmp)$(doc)/sysvutils/changelog*
-	install -d -o root -g root -m 755 $(tmp)/{bin,sbin,lib,usr}
-	install -d -o root -g root -m 755 $(tmp)/usr/bin
-	install -d -o root -g root -m 755 $(tmp)/usr/share/man
-	install -d -o root -g root -m 755 $(tmp)/usr/share/man/man{1,8}
-	install -o root -g root -m 755 src/killall5 $(tmp)/sbin
-	install -o root -g root -m 755 src/last $(tmp)/usr/bin
-	install -o root -g root -m 755 src/mesg $(tmp)/usr/bin
-	strip -s -R .comment $(tmp)/sbin/killall5
-	strip -s -R .comment $(tmp)/usr/bin/last
-	strip -s -R .comment $(tmp)/usr/bin/mesg
-	ln -sf ../sbin/killall5 $(tmp)/bin/pidof
-	ln -sf last $(tmp)/usr/bin/lastb
-	install -o root -g root -m 644 man/killall5.8 $(tmp)/usr/share/man/man8
-	install -o root -g root -m 644 man/last.1 $(tmp)/usr/share/man/man1
-	install -o root -g root -m 644 man/lastb.1 $(tmp)/usr/share/man/man1
-	install -o root -g root -m 644 man/mesg.1 $(tmp)/usr/share/man/man1
-	install -o root -g root -m 644 man/pidof.8 $(tmp)/usr/share/man/man8
-	gzip -9f $(tmp)/usr/share/man/man*/*.[0-9]
-	install -o root -g root -m 644 debian/copyright \
-	  $(tmp)$(doc)/sysvutils/copyright
-	cat COPYRIGHT >> $(tmp)$(doc)/sysvutils/copyright
-	dpkg-shlibdeps src/init
-	dpkg-gencontrol -psysvutils -P$(tmp) -isp
-	dpkg --build $(tmp) ..
-	rm -rf $(tmp)
-	#
 	# initscripts package
 	#
 	-rm -rf $(tmp)