[Pkg-sysvinit-commits] r1699 - in sysvinit/trunk/debian: . initscripts

[Petter Reinholdtsen]

Author: pere
Date: 2009-09-01 20:28:39 +0000 (Tue, 01 Sep 2009)
New Revision: 1699

Added:
   sysvinit/trunk/debian/initscripts.conffiles
Removed:
   sysvinit/trunk/debian/initscripts/conffiles
Modified:
   sysvinit/trunk/debian/rules
Log:
Move the last debian package file from a debian/ subdirectory to the debian/ directory.

Deleted: sysvinit/trunk/debian/initscripts/conffiles
===================================================================
--- sysvinit/trunk/debian/initscripts/conffiles	2009-09-01 20:27:33 UTC (rev 1698)
+++ sysvinit/trunk/debian/initscripts/conffiles	2009-09-01 20:28:39 UTC (rev 1699)
@@ -1,32 +0,0 @@
-/etc/init.d/bootlogd
-/etc/init.d/stop-bootlogd
-/etc/init.d/stop-bootlogd-single
-/etc/init.d/bootlogs
-/etc/init.d/bootmisc.sh
-/etc/init.d/checkfs.sh
-/etc/init.d/checkroot.sh
-/etc/init.d/halt
-/etc/init.d/hostname.sh
-/etc/init.d/killprocs
-/etc/init.d/mountall.sh
-/etc/init.d/mountall-bootclean.sh
-/etc/init.d/mountnfs.sh
-/etc/init.d/mountnfs-bootclean.sh
-/etc/init.d/mountoverflowtmp
-/etc/init.d/mountdevsubfs.sh
-/etc/init.d/mountkernfs.sh
-/etc/init.d/mtab.sh
-/etc/init.d/rc.local
-/etc/init.d/reboot
-/etc/init.d/rmnologin
-/etc/init.d/sendsigs
-/etc/init.d/single
-/etc/init.d/umountfs
-/etc/init.d/umountnfs.sh
-/etc/init.d/umountroot
-/etc/init.d/urandom
-/etc/default/bootlogd
-/etc/default/devpts
-/etc/default/halt
-/etc/default/tmpfs
-/etc/network/if-up.d/mountnfs

Copied: sysvinit/trunk/debian/initscripts.conffiles (from rev 1694, sysvinit/trunk/debian/initscripts/conffiles)
===================================================================
--- sysvinit/trunk/debian/initscripts.conffiles	                        (rev 0)
+++ sysvinit/trunk/debian/initscripts.conffiles	2009-09-01 20:28:39 UTC (rev 1699)
@@ -0,0 +1,32 @@
+/etc/init.d/bootlogd
+/etc/init.d/stop-bootlogd
+/etc/init.d/stop-bootlogd-single
+/etc/init.d/bootlogs
+/etc/init.d/bootmisc.sh
+/etc/init.d/checkfs.sh
+/etc/init.d/checkroot.sh
+/etc/init.d/halt
+/etc/init.d/hostname.sh
+/etc/init.d/killprocs
+/etc/init.d/mountall.sh
+/etc/init.d/mountall-bootclean.sh
+/etc/init.d/mountnfs.sh
+/etc/init.d/mountnfs-bootclean.sh
+/etc/init.d/mountoverflowtmp
+/etc/init.d/mountdevsubfs.sh
+/etc/init.d/mountkernfs.sh
+/etc/init.d/mtab.sh
+/etc/init.d/rc.local
+/etc/init.d/reboot
+/etc/init.d/rmnologin
+/etc/init.d/sendsigs
+/etc/init.d/single
+/etc/init.d/umountfs
+/etc/init.d/umountnfs.sh
+/etc/init.d/umountroot
+/etc/init.d/urandom
+/etc/default/bootlogd
+/etc/default/devpts
+/etc/default/halt
+/etc/default/tmpfs
+/etc/network/if-up.d/mountnfs

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2009-09-01 20:27:33 UTC (rev 1698)
+++ sysvinit/trunk/debian/rules	2009-09-01 20:28:39 UTC (rev 1699)
@@ -265,7 +265,7 @@
 	install -o root -g root -m 755 debian/initscripts.preinst  $(tmp)/DEBIAN/preinst
 	install -o root -g root -m 755 debian/initscripts.postinst $(tmp)/DEBIAN/postinst
 	install -o root -g root -m 755 debian/initscripts.postrm $(tmp)/DEBIAN/postrm
-	install -o root -g root -m 644 debian/initscripts/conffiles \
+	install -o root -g root -m 644 debian/initscripts.conffiles \
 	  $(tmp)/DEBIAN/conffiles
 	dpkg-shlibdeps debian/readlink
 	sh debian/deps-mount >> debian/substvars