[Initscripts-ng-commits] r618 - in /trunk/src/insserv/debian: changelog patches/00list patches/41_cleansystem.dpatch rules run-testsuite

[pere at users.alioth.debian.org]

Author: pere
Date: Sun Feb 17 12:53:53 2008
New Revision: 618

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=618
Log:
  * New patch 41_cleansystem to clean the .system file.  Changed rules
    file to make sure it take effect.
  * Change test suite to use /bin/bash, as it uses bash-features.

Added:
    trunk/src/insserv/debian/patches/41_cleansystem.dpatch   (with props)
Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/patches/00list
    trunk/src/insserv/debian/rules
    trunk/src/insserv/debian/run-testsuite

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=618&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Sun Feb 17 12:53:53 2008
@@ -23,6 +23,9 @@
   * New patch 51_overwrite_output to improve output when symlinks on
     disk do not match the default-* headers.
   * Added override file for slashem-common.
+  * New patch 41_cleansystem to clean the .system file.  Changed rules
+    file to make sure it take effect.
+  * Change test suite to use /bin/bash, as it uses bash-features.
   * Debconf translations:
     - Added Galician from Jacobo Tarrio (Closes: #465067).
     - Added Vietnamese from Clytie Siddall (Closes: #465437).

Modified: trunk/src/insserv/debian/patches/00list
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/00list?rev=618&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/00list (original)
+++ trunk/src/insserv/debian/patches/00list Sun Feb 17 12:53:53 2008
@@ -4,5 +4,6 @@
 32_debug_option
 33_nosuse_scripts
 40_segfault_virtprov
+41_cleansystem
 50_sign_warning
 51_overwrite_output

Added: trunk/src/insserv/debian/patches/41_cleansystem.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/41_cleansystem.dpatch?rev=618&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/41_cleansystem.dpatch (added)
+++ trunk/src/insserv/debian/patches/41_cleansystem.dpatch Sun Feb 17 12:53:53 2008
@@ -1,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+Remove the generated .system file when cleaning.
+
+ at DPATCH@
+--- insserv-1.11.0.orig/Makefile
++++ insserv-1.11.0/Makefile
+@@ -81,7 +81,7 @@
+ .force:
+ 
+ clean:
+-	$(RM) *.o *~ $(TODO) .depend.*
++	$(RM) *.o *~ $(TODO) .depend.* .system
+ 
+ -include .depend.listing .depend.insserv
+ 

Propchange: trunk/src/insserv/debian/patches/41_cleansystem.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/src/insserv/debian/rules
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/rules?rev=618&op=diff
==============================================================================
--- trunk/src/insserv/debian/rules (original)
+++ trunk/src/insserv/debian/rules Sun Feb 17 12:53:53 2008
@@ -36,12 +36,15 @@
 
 	touch build-stamp
 
-clean: unpatch clean-extra
+clean: clean-extra
 	dh_testdir
 	rm -f build-stamp
 
 	# Add here commands to clean up after the build process.
 	$(MAKE) clean
+
+	# Remove patches after doing 'make clean', to allow patches to adjust the clean target
+	$(MAKE) -f debian/rules unpatch
 
 	dh_clean 
 

Modified: trunk/src/insserv/debian/run-testsuite
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/run-testsuite?rev=618&op=diff
==============================================================================
--- trunk/src/insserv/debian/run-testsuite (original)
+++ trunk/src/insserv/debian/run-testsuite Sun Feb 17 12:53:53 2008
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 basedir=$(dirname $0)
 . $basedir/testsuite-common