SOURCES: initng-no-scripts.patch - merge

[glen]

Author: glen                         Date: Tue Mar  7 23:56:18 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- merge

---- Files affected:
SOURCES:
   initng-no-scripts.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/initng-no-scripts.patch
diff -u SOURCES/initng-no-scripts.patch:1.3 SOURCES/initng-no-scripts.patch:1.4
--- SOURCES/initng-no-scripts.patch:1.3	Tue Feb  7 00:05:12 2006
+++ SOURCES/initng-no-scripts.patch	Wed Mar  8 00:56:13 2006
@@ -1,24 +1,15 @@
---- initng-0.5.3/Makefile.am~	2006-01-22 22:07:18.000000000 +0200
-+++ initng-0.5.3/Makefile.am	2006-02-06 00:12:44.000000000 +0200
-@@ -1,4 +1,4 @@
+diff -ur initng-0.5.4/Makefile.am initng-0.5.4.new/Makefile.am
+--- initng-0.5.4/Makefile.am	2006-02-22 13:12:24.000000000 +0200
++++ initng-0.5.4.new/Makefile.am	2006-03-08 01:54:43.000000000 +0200
+@@ -1,6 +1,4 @@
 -SUBDIRS = tools src plugins scripts doc fixes initfiles gui devtool
-+SUBDIRS = tools src plugins scripts doc gui devtool
- 
- sbin_SCRIPTS = gen_system_runlevel
- 
---- initng-0.5.3/Makefile.am~	2006-02-06 00:15:45.000000000 +0200
-+++ initng-0.5.3/Makefile.am	2006-02-06 02:47:33.000000000 +0200
-@@ -1,7 +1,5 @@
- SUBDIRS = tools src plugins scripts doc gui devtool
- 
--sbin_SCRIPTS = gen_system_runlevel
 -
+-sbin_SCRIPTS = gen_system_runlevel
++SUBDIRS = tools src plugins doc gui devtool
+ 
  BUILT_SOURCES = initng-paths.h
  CLEANFILES =    initng-paths.h
- 
---- initng-0.5.3/Makefile.am~	2006-02-06 02:49:01.000000000 +0200
-+++ initng-0.5.3/Makefile.am	2006-02-06 03:00:26.000000000 +0200
-@@ -19,7 +19,6 @@
+@@ -21,7 +19,6 @@
  	@echo "eg. at the end of the kernel line in /boot/grub/grub.conf"
  	@echo "Have a lot of fun!"
  	@echo
@@ -26,50 +17,32 @@
  	@echo
  	@echo "If you have initng running, you can reload it with:"
  	@echo "# /sbin/ngc -c"
---- initng-0.5.3/tools/Makefile.am~	2006-02-06 03:10:19.000000000 +0200
-+++ initng-0.5.3/tools/Makefile.am	2006-02-06 03:10:24.000000000 +0200
-@@ -4,10 +4,9 @@
+diff -ur initng-0.5.4/doc/Makefile.am initng-0.5.4.new/doc/Makefile.am
+--- initng-0.5.4/doc/Makefile.am	2006-02-22 13:12:29.000000000 +0200
++++ initng-0.5.4.new/doc/Makefile.am	2006-03-08 01:54:43.000000000 +0200
+@@ -1,7 +1,5 @@
+ man_MANS = \
+-	gen_system_runlevel.8 \
+ 	initng.8 \
+-	install_service.8 \
+ 	ngc.8 \
+ 	ngdc.8 \
+ 	ng-update.8 \
+diff -ur initng-0.5.4/tools/Makefile.am initng-0.5.4.new/tools/Makefile.am
+--- initng-0.5.4/tools/Makefile.am	2006-02-22 13:12:29.000000000 +0200
++++ initng-0.5.4.new/tools/Makefile.am	2006-03-08 01:54:43.000000000 +0200
+@@ -2,12 +2,10 @@
+ 
+ AUTOMAKE_OPTIONS = gnu
  
- install_service_SOURCES = install_service.c
+-install_service_SOURCES = install_service.c
  system_off_SOURCES = system_off.c
 -killalli5_SOURCES = killall5.c
  
 -sbin_PROGRAMS = system_off install_service killalli5
 -sbin_SCRIPTS  = ng-update shutdown_script initng-segfault
-+sbin_PROGRAMS = system_off install_service
++sbin_PROGRAMS = system_off
 +sbin_SCRIPTS  = ng-update initng-segfault
  
  
  if INSTALL_AS_INIT
---- initng-0.5.3/Makefile.am~	2006-02-06 03:03:50.000000000 +0200
-+++ initng-0.5.3/Makefile.am	2006-02-06 03:12:28.000000000 +0200
-@@ -1,4 +1,4 @@
--SUBDIRS = tools src plugins scripts doc gui devtool
-+SUBDIRS = tools src plugins doc gui devtool
- 
- BUILT_SOURCES = initng-paths.h
- CLEANFILES =    initng-paths.h
---- initng-0.5.3/tools/Makefile.am~	2006-02-06 03:21:06.000000000 +0200
-+++ initng-0.5.3/tools/Makefile.am	2006-02-06 03:21:08.000000000 +0200
-@@ -2,10 +2,9 @@
- 
- AUTOMAKE_OPTIONS = gnu
- 
--install_service_SOURCES = install_service.c
- system_off_SOURCES = system_off.c
- 
--sbin_PROGRAMS = system_off install_service
-+sbin_PROGRAMS = system_off
- sbin_SCRIPTS  = ng-update initng-segfault
- 
- 
---- initng-0.5.3/doc/Makefile.am~	2006-01-22 22:07:25.000000000 +0200
-+++ initng-0.5.3/doc/Makefile.am	2006-02-07 01:04:34.000000000 +0200
-@@ -1,7 +1,5 @@
- man_MANS = \
--	gen_system_runlevel.8 \
- 	initng.8 \
--	install_service.8 \
- 	ngc.8 \
- 	ngdc.8 \
- 	ng-update.8 \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/initng-no-scripts.patch?r1=1.3&r2=1.4&f=u