[Python-modules-commits] r24162 - in packages/py3dns/trunk/debian (7 files)

Mon May 6 23:18:57 UTC 2013

Date: Monday, May 6, 2013 @ 23:18:55
  Author: kitterman
Revision: 24162

* Use dh_clean instead of dh_auto_clean to avoid use of pyversions and FTBFS
  with debhelper >= 9.20130504
* Fix __version__ in DNS/__init__.py
  - Build --with quilt and add quilt to build-depends
  - Add README.source
  - Add debian/patches/fix_version.diff
* Bump standards version to 3.9.4 without further change

Added:
  packages/py3dns/trunk/debian/README.source
  packages/py3dns/trunk/debian/patches/
  packages/py3dns/trunk/debian/patches/fix_version.patch
  packages/py3dns/trunk/debian/patches/series
Modified:
  packages/py3dns/trunk/debian/changelog
  packages/py3dns/trunk/debian/control
  packages/py3dns/trunk/debian/rules

Added: packages/py3dns/trunk/debian/README.source
===================================================================

--- packages/py3dns/trunk/debian/README.source	                        (rev 0)
+++ packages/py3dns/trunk/debian/README.source	2013-05-06 23:18:55 UTC (rev 24162)
@@ -0,0 +1,58 @@
+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/py3dns/trunk/debian/changelog
===================================================================
--- packages/py3dns/trunk/debian/changelog	2013-05-06 22:40:35 UTC (rev 24161)
+++ packages/py3dns/trunk/debian/changelog	2013-05-06 23:18:55 UTC (rev 24162)
@@ -1,9 +1,19 @@
-py3dns (3.0.2-2) UNRELEASED; urgency=low
+py3dns (3.0.2-2) unstable; urgency=low
 
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:01:34 +0200
+  [ Scott Kitterman ]
+  * Use dh_clean instead of dh_auto_clean to avoid use of pyversions and FTBFS
+    with debhelper >= 9.20130504
+  * Fix __version__ in DNS/__init__.py
+    - Build --with quilt and add quilt to build-depends
+    - Add README.source
+    - Add debian/patches/fix_version.diff
+  * Bump standards version to 3.9.4 without further change
 
+ -- Scott Kitterman <scott at kitterman.com>  Mon, 06 May 2013 18:55:28 -0400
+
 py3dns (3.0.2-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/py3dns/trunk/debian/control
===================================================================
--- packages/py3dns/trunk/debian/control	2013-05-06 22:40:35 UTC (rev 24161)
+++ packages/py3dns/trunk/debian/control	2013-05-06 23:18:55 UTC (rev 24162)
@@ -3,10 +3,10 @@
 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.3.16), python3-all (>= 3.1.2-8~)
+Build-Depends: debhelper (>= 7.3.16), python3-all (>= 3.1.2-8~), quilt
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/py3dns/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/py3dns/trunk/
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://launchpad.net/py3dns
 X-Python3-Version: >= 3.0
 

Added: packages/py3dns/trunk/debian/patches/fix_version.patch
===================================================================
--- packages/py3dns/trunk/debian/patches/fix_version.patch	                        (rev 0)
+++ packages/py3dns/trunk/debian/patches/fix_version.patch	2013-05-06 23:18:55 UTC (rev 24162)
@@ -0,0 +1,13 @@
+Index: py3dns-3.0.2/DNS/__init__.py
+===================================================================
+--- py3dns-3.0.2.orig/DNS/__init__.py	2013-05-06 19:08:01.282739730 -0400
++++ py3dns-3.0.2/DNS/__init__.py	2013-05-06 19:09:20.858737644 -0400
+@@ -10,7 +10,7 @@
+ 
+ # __init__.py for DNS class.
+ 
+-__version__ = '3.0.1'
++__version__ = '3.0.2'
+ 
+ from . import Type
+ from . import Opcode

Added: packages/py3dns/trunk/debian/patches/series
===================================================================
--- packages/py3dns/trunk/debian/patches/series	                        (rev 0)
+++ packages/py3dns/trunk/debian/patches/series	2013-05-06 23:18:55 UTC (rev 24162)
@@ -0,0 +1 @@
+fix_version.patch

Modified: packages/py3dns/trunk/debian/rules
===================================================================
--- packages/py3dns/trunk/debian/rules	2013-05-06 22:40:35 UTC (rev 24161)
+++ packages/py3dns/trunk/debian/rules	2013-05-06 23:18:55 UTC (rev 24162)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with python3
+	dh $@ --with python3, --with quilt
 
 override_dh_auto_build:
 override_dh_auto_install:
@@ -12,3 +12,8 @@
 	find $(CURDIR)/debian/python3-dns -name win32dns.py | xargs rm -f
 	dh_install
 
+override_dh_auto_clean:
+	dh_clean
+	rm -rf $(CURDIR)/build
+	rm -rf $(CURDIR)/DNS/__pycache__
+


