[Python-modules-commits] r9347 - in packages/cherrypy3/trunk/debian (changelog rules)

[kov at users.alioth.debian.org]

    Date: Saturday, August 15, 2009 @ 17:51:28
  Author: kov
Revision: 9347

Use quilt.mk instead of own code to be quilt source format compatible

Modified:
  packages/cherrypy3/trunk/debian/changelog
  packages/cherrypy3/trunk/debian/rules

Modified: packages/cherrypy3/trunk/debian/changelog
===================================================================
--- packages/cherrypy3/trunk/debian/changelog	2009-08-15 17:34:06 UTC (rev 9346)
+++ packages/cherrypy3/trunk/debian/changelog	2009-08-15 17:51:28 UTC (rev 9347)
@@ -1,8 +1,12 @@
 cherrypy3 (3.1.2-1) unstable; urgency=low
 
   * New upstream release (Closes: #528473)
+  * debian/rules:
+  - use the quilt make include file instead of using custom code; should
+    make the package convertable to the new quilt source format
+    (Closes: #538677)
 
- -- Gustavo Noronha Silva <kov at debian.org>  Sat, 15 Aug 2009 14:31:36 -0300
+ -- Gustavo Noronha Silva <kov at debian.org>  Sat, 15 Aug 2009 14:36:13 -0300
 
 cherrypy3 (3.1.1-3) unstable; urgency=low
 

Modified: packages/cherrypy3/trunk/debian/rules
===================================================================
--- packages/cherrypy3/trunk/debian/rules	2009-08-15 17:34:06 UTC (rev 9346)
+++ packages/cherrypy3/trunk/debian/rules	2009-08-15 17:51:28 UTC (rev 9347)
@@ -1,26 +1,15 @@
 #!/usr/bin/make -f
 
+include /usr/share/quilt/quilt.make
+
 PY_DEFAULT = $(strip $(shell pyversions -d))
 
-PATCH_DIR := debian/patches
-QUILT := QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null
-
-clean:
-	$(QUILT) pop -a -R || test $$? = 2
+clean: unpatch
 	dh clean
 	-rm -rf api
-	-rm .pc/.version
 	-rm -rf CherryPy.egg-info/
 
-
-patch: patch-stamp
-patch-stamp:
-	dh_testdir
-	$(QUILT) push -a || test $$? = 2
-	touch $@
-
-
-build: patch-stamp
+build: $(QUILT_STAMPFN)
 	env PYTHONPATH=`pwd` epydoc --name CherryPy3 --url http://www.cherrypy.org/ -o api cherrypy
 	dh build
 
@@ -52,4 +41,4 @@
 binary: build binary-indep binary-arch
 
 
-.PHONY: patch build clean install binary-indep binary-arch binary
+.PHONY: build clean install binary-indep binary-arch binary