r11531 - in packages/trunk/cookietool/debian: . source

[Peter Pentchev]

Author: roam-guest
Date: 2010-11-28 15:55:38 +0000 (Sun, 28 Nov 2010)
New Revision: 11531

Removed:
   packages/trunk/cookietool/debian/README.source
Modified:
   packages/trunk/cookietool/debian/changelog
   packages/trunk/cookietool/debian/control
   packages/trunk/cookietool/debian/rules
   packages/trunk/cookietool/debian/source/format
Log:
Switch to the 3.0 (quilt) source format.


Deleted: packages/trunk/cookietool/debian/README.source
===================================================================
--- packages/trunk/cookietool/debian/README.source	2010-11-28 15:50:01 UTC (rev 11530)
+++ packages/trunk/cookietool/debian/README.source	2010-11-28 15:55:38 UTC (rev 11531)
@@ -1,17 +0,0 @@
-The cookietool package uses quilt to maintain local changes to
-the cookietool distribution.  The Debian-specific patches are maintained
-in the debian/patches/ directory.
-
-To apply all the patches, preparing the source for building, use:
-  debian/rules patch
-
-To revert the patches, preparing to build a source package, use:
-  debian/rules unpatch
-
-You do not need to manually execute these targets when building
-the package; they are part of the debian/rules target chain.
-
-For more information on the quilt integration with Debian packages,
-as well as editing, adding or removing patches, please see
-the quilt documentation; in recent versions of the Debian package of
-quilt, start at the /usr/share/doc/quilt/README.source file.

Modified: packages/trunk/cookietool/debian/changelog
===================================================================
--- packages/trunk/cookietool/debian/changelog	2010-11-28 15:50:01 UTC (rev 11530)
+++ packages/trunk/cookietool/debian/changelog	2010-11-28 15:55:38 UTC (rev 11531)
@@ -1,6 +1,9 @@
 cookietool (2.5-5) UNRELEASED; urgency=low
 
-  * Set the source format to 1.0 for the present.
+  * Switch to the 3.0 (quilt) source format:
+    - drop the quilt build dependency
+    - drop the use of the quilt debhelper plugin in the rules file
+    - remove the README.source file
 
  -- Peter Pentchev <roam at ringlet.net>  Sun, 28 Nov 2010 16:58:20 +0200
 

Modified: packages/trunk/cookietool/debian/control
===================================================================
--- packages/trunk/cookietool/debian/control	2010-11-28 15:50:01 UTC (rev 11530)
+++ packages/trunk/cookietool/debian/control	2010-11-28 15:55:38 UTC (rev 11531)
@@ -1,7 +1,7 @@
 Source: cookietool
 Section: games
 Priority: optional
-Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7), hardening-wrapper
+Build-Depends: debhelper (>= 7.0.50), hardening-wrapper
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Peter Pentchev <roam at ringlet.net>
 Standards-Version: 3.8.3

Modified: packages/trunk/cookietool/debian/rules
===================================================================
--- packages/trunk/cookietool/debian/rules	2010-11-28 15:50:01 UTC (rev 11530)
+++ packages/trunk/cookietool/debian/rules	2010-11-28 15:55:38 UTC (rev 11531)
@@ -15,14 +15,11 @@
 export DEB_BUILD_HARDENING=0
 endif
 
-patch unpatch:
-	$(MAKE) -f /usr/share/quilt/quilt.make $@
-
 override_dh_auto_build:
-	dh_auto_build --with quilt
+	dh_auto_build
 	awk '/^[0-9]+\..*History/ { disp = 1 } \
 	     /^[0-9]/ && !/^[0-9]+\..*History/ { disp = 0 } \
 	     { if (disp) { print } }' README > Changes
 
 %:
-	dh --with quilt $@
+	dh $@

Modified: packages/trunk/cookietool/debian/source/format
===================================================================
--- packages/trunk/cookietool/debian/source/format	2010-11-28 15:50:01 UTC (rev 11530)
+++ packages/trunk/cookietool/debian/source/format	2010-11-28 15:55:38 UTC (rev 11531)
@@ -1 +1 @@
-1.0
+3.0 (quilt)