[Initscripts-ng-commits] r1048 - in /trunk/src/insserv/debian: README.source changelog control rules source/format watch

Mon May 3 06:06:10 UTC 2010

Author: kelmo-guest
Date: Mon May  3 06:06:08 2010
New Revision: 1048

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=1048
Log:
Roll back changes to make package source format 3.0 (quilt). Set format to 1.0

Added:
    trunk/src/insserv/debian/README.source
Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/control
    trunk/src/insserv/debian/rules
    trunk/src/insserv/debian/source/format
    trunk/src/insserv/debian/watch

Added: trunk/src/insserv/debian/README.source
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/README.source?rev=1048&op=file
==============================================================================

--- trunk/src/insserv/debian/README.source (added)
+++ trunk/src/insserv/debian/README.source Mon May  3 06:06:08 2010
@@ -1,0 +1,16 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To get the fully patched source after unpacking the source package, cd
+to the root level of the source package and run:
+
+    debian/rules patch
+
+Removing a patch is as simple as removing its entry from the
+debian/patches/series file, and please also remove the patch file
+itself.
+
+To clean up afterwards again, "debian/rules unpatch" will do the
+work for you - or you can of course choose to call
+"fakeroot debian/rules clean" all together.

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=1048&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Mon May  3 06:06:08 2010
@@ -1,4 +1,4 @@
-insserv (1.14.0-1) UNRELEASED; urgency=low
+insserv (1.14.0-1) unstable; urgency=low
 
   [ Petter Reinholdtsen ]
   * Fix typo (loop->look) in previous changelog (Closes: #549286).
@@ -31,18 +31,13 @@
     - 95_stop_all.patch
     - 96_hurd_no_at_funcs.patch
   * Refresh remaining patch series.
-  * Set debian/source/format to 3.0 (quilt).
-  * Drop quilt from build-depends, remove quilt usage from debian/rules.
-  * Remove debian/README.source which explained how to use quilt to
-    patch/unpatch - that is now done thanks to source format 3.0 (quilt).
+  * Set debian/source/format to 1.0.
   * Adjust Standards-Version to 3.8.4, no other chages required.
   * Add 20_manpage_spelling.patch to fix spelling errors in insserv(8).
   * Add note next to test_undetected_loop() that it's 2 tests currently
     fail but are not terminal.
-  * Update debian/watch to use bz2 orig upstream archive. Set version in
-    debian/watch to 3 and remove uupdate which is no longer needed.
-
- -- Kel Modderman <kel at otaku42.de>  Mon, 03 May 2010 15:51:04 +1000
+
+ -- Kel Modderman <kel at otaku42.de>  Mon, 03 May 2010 16:01:21 +1000
 
 insserv (1.12.0-14) unstable; urgency=low
 

Modified: trunk/src/insserv/debian/control
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/control?rev=1048&op=diff
==============================================================================
--- trunk/src/insserv/debian/control (original)
+++ trunk/src/insserv/debian/control Mon May  3 06:06:08 2010
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Petter Reinholdtsen <pere at debian.org>
 Uploaders: Kel Modderman <kel at otaku42.de>
-Build-Depends: debhelper (>= 6.0.7), po-debconf
+Build-Depends: debhelper (>= 6.0.7), po-debconf, quilt
 Standards-Version: 3.8.4
 DM-Upload-Allowed: yes
 Homepage: http://savannah.nongnu.org/projects/sysvinit

Modified: trunk/src/insserv/debian/rules
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/rules?rev=1048&op=diff
==============================================================================
--- trunk/src/insserv/debian/rules (original)
+++ trunk/src/insserv/debian/rules Mon May  3 06:06:08 2010
@@ -21,9 +21,11 @@
 pkgdatadir = /usr/share/$(PACKAGE)
 sbindir = /usr/sbin
 
+include /usr/share/quilt/quilt.make
+
 build: build-stamp
 
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -40,6 +42,9 @@
 
 	# 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/source/format
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/source/format?rev=1048&op=diff
==============================================================================
--- trunk/src/insserv/debian/source/format (original)
+++ trunk/src/insserv/debian/source/format Mon May  3 06:06:08 2010
@@ -1,1 +1,1 @@
-3.0 (quilt)
+1.0

Modified: trunk/src/insserv/debian/watch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/watch?rev=1048&op=diff
==============================================================================
--- trunk/src/insserv/debian/watch (original)
+++ trunk/src/insserv/debian/watch Mon May  3 06:06:08 2010
@@ -1,6 +1,6 @@
 # Run the "uscan" command to check for upstream updates and more.
 # See uscan(1) for format
 
-version=3
+version=2
 
-ftp://ftp.suse.com/pub/projects/init/insserv-(.*).tar.bz2
+ftp://ftp.suse.com/pub/projects/init/insserv-(.*).tar.gz debian uupdate


