[Python-modules-commits] r16508 - in packages/python-contract/trunk/debian (5 files)

[jwilk at users.alioth.debian.org]

    Date: Thursday, April 14, 2011 @ 13:01:18
  Author: jwilk
Revision: 16508

Switch to source format 3.0 (quilt).

Modified:
  packages/python-contract/trunk/debian/changelog
  packages/python-contract/trunk/debian/control
  packages/python-contract/trunk/debian/rules
  packages/python-contract/trunk/debian/source/format
Deleted:
  packages/python-contract/trunk/debian/README.source

Deleted: packages/python-contract/trunk/debian/README.source
===================================================================
--- packages/python-contract/trunk/debian/README.source	2011-04-14 12:58:46 UTC (rev 16507)
+++ packages/python-contract/trunk/debian/README.source	2011-04-14 13:01:18 UTC (rev 16508)
@@ -1,58 +0,0 @@
-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 configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
-    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
-        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
-                export QUILT_PATCHES=debian/patches
-                break
-        fi
-    done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
-    quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
-    quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches.  Then, for every file that will be modified by this patch,
-run:
-
-    quilt add <file>
-
-before editing those files.  You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly.  After editing the files, run:
-
-    quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
-    quilt import -P <patch> /path/to/patch
-    quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches.  The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
-    quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.

Modified: packages/python-contract/trunk/debian/changelog
===================================================================
--- packages/python-contract/trunk/debian/changelog	2011-04-14 12:58:46 UTC (rev 16507)
+++ packages/python-contract/trunk/debian/changelog	2011-04-14 13:01:18 UTC (rev 16508)
@@ -22,10 +22,12 @@
   * Add ${misc:Depends}.
   * Build-depend on python-all rather than python-all-dev.
   * Remove debian/dirs; not needed anymore.
+  * Switch to source format 3.0 (quilt).
   * Bump standards version to 3.9.2.
-    + Add README.source.
+    + Remove quilt from Build-Depends.
+    + Remove explicit patching from debian/rules.
 
- -- Jakub Wilk <jwilk at debian.org>  Thu, 14 Apr 2011 14:56:30 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Thu, 14 Apr 2011 15:00:45 +0200
 
 python-contract (1.4-2) unstable; urgency=low
 

Modified: packages/python-contract/trunk/debian/control
===================================================================
--- packages/python-contract/trunk/debian/control	2011-04-14 12:58:46 UTC (rev 16507)
+++ packages/python-contract/trunk/debian/control	2011-04-14 13:01:18 UTC (rev 16508)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Debian QA Group <packages at qa.debian.org>
-Build-Depends: quilt, debhelper (>= 5.0.37.2), python-all (>= 0.4.42)
+Build-Depends: debhelper (>= 5.0.37.2), python-all (>= 0.4.42)
 Build-Depends-Indep: python-support (>= 0.3)
 Standards-Version: 3.9.2
 Homepage: http://www.wayforward.net/pycontract/

Modified: packages/python-contract/trunk/debian/rules
===================================================================
--- packages/python-contract/trunk/debian/rules	2011-04-14 12:58:46 UTC (rev 16507)
+++ packages/python-contract/trunk/debian/rules	2011-04-14 13:01:18 UTC (rev 16508)
@@ -2,10 +2,7 @@
 PKGNAME:=python-contract
 PYVERS:=$(shell pyversions -r)
 
-
-include /usr/share/quilt/quilt.make
-
-build: patch build-stamp
+build: build-stamp
 build-stamp:
 	dh_testdir
 
@@ -25,7 +22,7 @@
 
 	touch $@
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	-for py in $(PYVERS); do  \

Modified: packages/python-contract/trunk/debian/source/format
===================================================================
--- packages/python-contract/trunk/debian/source/format	2011-04-14 12:58:46 UTC (rev 16507)
+++ packages/python-contract/trunk/debian/source/format	2011-04-14 13:01:18 UTC (rev 16508)
@@ -1 +1 @@
-1.0
+3.0 (quilt)