[Python-modules-commits] r7697 - in packages/cherrypy3/trunk/debian (7 files)

[kov at users.alioth.debian.org]

    Date: Sunday, February 22, 2009 @ 16:57:25
  Author: kov
Revision: 7697

use quilt for patches

Added:
  packages/cherrypy3/trunk/debian/patches/series
Modified:
  packages/cherrypy3/trunk/debian/changelog
  packages/cherrypy3/trunk/debian/control
  packages/cherrypy3/trunk/debian/patches/00_supress_profiler_warning.diff
  packages/cherrypy3/trunk/debian/patches/01_cherryd_location_fix.diff
  packages/cherrypy3/trunk/debian/patches/02_eggify.diff
  packages/cherrypy3/trunk/debian/rules

Modified: packages/cherrypy3/trunk/debian/changelog
===================================================================
--- packages/cherrypy3/trunk/debian/changelog	2009-02-22 16:40:30 UTC (rev 7696)
+++ packages/cherrypy3/trunk/debian/changelog	2009-02-22 16:57:25 UTC (rev 7697)
@@ -7,6 +7,7 @@
   - use debhelper 7 instead of cdbs; this rework also makes our
     installation process stop depending on python-support locations
     (Closes: #516144)
+  - use quilt for patches
   * debian/rules:
   - remove aditional LICENSE.txt file that is being installed
   * debian/rules, debian/python-cherrypy3.dirs, debian/python-cherrypy3.links,

Modified: packages/cherrypy3/trunk/debian/control
===================================================================
--- packages/cherrypy3/trunk/debian/control	2009-02-22 16:40:30 UTC (rev 7696)
+++ packages/cherrypy3/trunk/debian/control	2009-02-22 16:57:25 UTC (rev 7697)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Gustavo Noronha Silva <kov at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.0), python-setuptools (>= 0.6a9), python-all-dev (>= 2.3.5-11), python-support (>= 0.6.4)
+Build-Depends: debhelper (>= 7.0.0), quilt, python-setuptools (>= 0.6a9), python-all-dev (>= 2.3.5-11), python-support (>= 0.6.4)
 Build-Depends-Indep: python-epydoc
 Standards-Version: 3.8.0
 Homepage: http://www.cherrypy.org/

Modified: packages/cherrypy3/trunk/debian/patches/00_supress_profiler_warning.diff
===================================================================
--- packages/cherrypy3/trunk/debian/patches/00_supress_profiler_warning.diff	2009-02-22 16:40:30 UTC (rev 7696)
+++ packages/cherrypy3/trunk/debian/patches/00_supress_profiler_warning.diff	2009-02-22 16:57:25 UTC (rev 7697)
@@ -1,5 +1,5 @@
---- cherrypy/lib/profiler.py.orig	2006-12-18 02:50:52.000000000 -0200
-+++ cherrypy/lib/profiler.py	2007-01-08 22:32:51.000000000 -0200
+--- a/cherrypy/lib/profiler.py.orig	2006-12-18 02:50:52.000000000 -0200
++++ b/cherrypy/lib/profiler.py	2007-01-08 22:32:51.000000000 -0200
 @@ -50,12 +50,15 @@
  except ImportError:
      profile = None

Modified: packages/cherrypy3/trunk/debian/patches/01_cherryd_location_fix.diff
===================================================================
--- packages/cherrypy3/trunk/debian/patches/01_cherryd_location_fix.diff	2009-02-22 16:40:30 UTC (rev 7696)
+++ packages/cherrypy3/trunk/debian/patches/01_cherryd_location_fix.diff	2009-02-22 16:57:25 UTC (rev 7697)
@@ -1,5 +1,5 @@
---- cherrypy/test/helper.py~	2008-11-08 17:19:39.000000000 -0200
-+++ cherrypy/test/helper.py	2008-12-10 10:53:48.000000000 -0200
+--- a/cherrypy/test/helper.py~	2008-11-08 17:19:39.000000000 -0200
++++ b/cherrypy/test/helper.py	2008-12-10 10:53:48.000000000 -0200
 @@ -284,7 +284,7 @@
          """Start cherryd in a subprocess."""
          cherrypy._cpserver.wait_for_free_port(self.host, self.port)

Modified: packages/cherrypy3/trunk/debian/patches/02_eggify.diff
===================================================================
--- packages/cherrypy3/trunk/debian/patches/02_eggify.diff	2009-02-22 16:40:30 UTC (rev 7696)
+++ packages/cherrypy3/trunk/debian/patches/02_eggify.diff	2009-02-22 16:57:25 UTC (rev 7697)
@@ -1,5 +1,5 @@
---- setup.py~	2006-04-24 22:37:55.000000000 -0300
-+++ setup.py	2006-06-04 23:02:07.000000000 -0300
+--- a/setup.py~	2006-04-24 22:37:55.000000000 -0300
++++ b/setup.py	2006-06-04 23:02:07.000000000 -0300
 @@ -6,7 +6,8 @@
  to install this package.
  """

Added: packages/cherrypy3/trunk/debian/patches/series
===================================================================
--- packages/cherrypy3/trunk/debian/patches/series	                        (rev 0)
+++ packages/cherrypy3/trunk/debian/patches/series	2009-02-22 16:57:25 UTC (rev 7697)
@@ -0,0 +1,3 @@
+00_supress_profiler_warning.diff
+01_cherryd_location_fix.diff
+02_eggify.diff
\ No newline at end of file

Modified: packages/cherrypy3/trunk/debian/rules
===================================================================
--- packages/cherrypy3/trunk/debian/rules	2009-02-22 16:40:30 UTC (rev 7696)
+++ packages/cherrypy3/trunk/debian/rules	2009-02-22 16:57:25 UTC (rev 7697)
@@ -1,16 +1,22 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM := pysupport
+PATCH_DIR := debian/patches
+QUILT := QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null
 
-DEB_COMPRESS_EXCLUDE=.py .pdf
-DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
-
 clean:
+	$(QUILT) pop -a -R || test $$? = 2
 	dh clean
 	-rm -rf api
 
 
-build:
+patch: patch-stamp
+patch-stamp:
+	dh_testdir
+	$(QUILT) push -a || test $$? = 2
+	touch $@
+
+
+build: patch-stamp
 	env PYTHONPATH=`pwd` epydoc --name CherryPy3 --url http://www.cherrypy.org/ -o api cherrypy
 	dh build
 
@@ -41,4 +47,4 @@
 binary: build binary-indep binary-arch
 
 
-.PHONY: build clean install binary-indep binary-arch binary
+.PHONY: patch build clean install binary-indep binary-arch binary