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

[kitterma-guest at users.alioth.debian.org]

    Date: Wednesday, March 3, 2010 @ 03:41:30
  Author: kitterma-guest
Revision: 12131

Drop patches (incorporated upstream) and prepare for 2.1.1.

Modified:
  packages/python-ipaddr/trunk/debian/changelog
  packages/python-ipaddr/trunk/debian/control
  packages/python-ipaddr/trunk/debian/rules
Deleted:
  packages/python-ipaddr/trunk/debian/README.source
  packages/python-ipaddr/trunk/debian/patches/

Deleted: packages/python-ipaddr/trunk/debian/README.source
===================================================================
--- packages/python-ipaddr/trunk/debian/README.source	2010-03-03 00:48:49 UTC (rev 12130)
+++ packages/python-ipaddr/trunk/debian/README.source	2010-03-03 03:41:30 UTC (rev 12131)
@@ -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
-        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-ipaddr/trunk/debian/changelog
===================================================================
--- packages/python-ipaddr/trunk/debian/changelog	2010-03-03 00:48:49 UTC (rev 12130)
+++ packages/python-ipaddr/trunk/debian/changelog	2010-03-03 03:41:30 UTC (rev 12131)
@@ -1,3 +1,15 @@
+python-ipaddr (2.1.1-1) unstable; urgency=low
+
+  * New upstream bugfix release
+    - Drop debian/patches/IPv4IpValidationError (incorporated upstream)
+  * Drop patch system (not used)
+    - Remove quilt build-dep
+    - Adjust debian/rules
+    - Remove debian/patches
+    - Remove debian/README.source
+
+ -- Scott Kitterman <scott at kitterman.com>  Tue, 02 Mar 2010 22:18:21 -0500
+
 python-ipaddr (2.1.0-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/python-ipaddr/trunk/debian/control
===================================================================
--- packages/python-ipaddr/trunk/debian/control	2010-03-03 00:48:49 UTC (rev 12130)
+++ packages/python-ipaddr/trunk/debian/control	2010-03-03 03:41:30 UTC (rev 12131)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Scott Kitterman <scott at kitterman.com>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.2.11), quilt (>= 0.46-7)
+Build-Depends: debhelper (>= 7.2.11)
 Build-Depends-Indep: python-all (>= 2.5.4-2~), python-support (>= 0.6.4)
 Standards-Version: 3.8.4
 Homepage: http://code.google.com/p/ipaddr-py/

Modified: packages/python-ipaddr/trunk/debian/rules
===================================================================
--- packages/python-ipaddr/trunk/debian/rules	2010-03-03 00:48:49 UTC (rev 12130)
+++ packages/python-ipaddr/trunk/debian/rules	2010-03-03 03:41:30 UTC (rev 12131)
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with quilt
+	dh $@