[Python-modules-commits] r13549 - in packages/python-dns/trunk/debian (7 files)

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Tue Jun 22 23:57:29 UTC 2010 

    Date: Tuesday, June 22, 2010 @ 23:57:27
  Author: kitterman
Revision: 13549

  * Convert from CDBS to Debhelper 7
    - Port debian/rules to DH 7 --with quilt plus overrides
    - Drop cdbs from build-depends
    - Add quilt to build-depends
    - Update debian/README.source
    - Bump debhelper version requirement
    - Change compat to 7
    - Remove cdbs generated pycompat
  * Convert from python-central to dh_python2
    - Drop build-depends on python-central
    - Version build-depend on python (>- 2.6.5.-2~)
    - Add --with python2 to debian/rules
  * Improve short and long description
  * Drop DM-Upload-Allowed

Modified:
  packages/python-dns/trunk/debian/README.source
  packages/python-dns/trunk/debian/changelog
  packages/python-dns/trunk/debian/control
  packages/python-dns/trunk/debian/patches/examples-interpreter.diff
  packages/python-dns/trunk/debian/patches/lazy-revlookup.diff
  packages/python-dns/trunk/debian/rules
Deleted:
  packages/python-dns/trunk/debian/pycompat

Modified: packages/python-dns/trunk/debian/README.source
===================================================================
--- packages/python-dns/trunk/debian/README.source	2010-06-22 22:15:14 UTC (rev 13548)
+++ packages/python-dns/trunk/debian/README.source	2010-06-22 23:57:27 UTC (rev 13549)
@@ -1,4 +1,5 @@
-This package uses CDBS simple patchsys.  dpkg-source -x does produce source
+This package uses quilt for patches.  dpkg-source -x does produce source
 ready for building with dpkg-buildpackage.  It does not procude source ready
-for editing.  To edit or update a patch, use cdbs-edit-patch.  See man
-cdbs-edit-patch for details.
+for editing.  See /usr/share/doc/quilt/README.source for information on using
+quilt.
+

Modified: packages/python-dns/trunk/debian/changelog
===================================================================
--- packages/python-dns/trunk/debian/changelog	2010-06-22 22:15:14 UTC (rev 13548)
+++ packages/python-dns/trunk/debian/changelog	2010-06-22 23:57:27 UTC (rev 13549)
@@ -1,3 +1,22 @@
+python-dns (2.3.4-4) unstable; urgency=low
+
+  * Convert from CDBS to Debhelper 7
+    - Port debian/rules to DH 7 --with quilt plus overrides
+    - Drop cdbs from build-depends
+    - Add quilt to build-depends
+    - Update debian/README.source
+    - Bump debhelper version requirement
+    - Change compat to 7
+    - Remove cdbs generated pycompat
+  * Convert from python-central to dh_python2
+    - Drop build-depends on python-central
+    - Version build-depend on python (>- 2.6.5.-2~)
+    - Add --with python2 to debian/rules
+  * Improve short and long description
+  * Drop DM-Upload-Allowed
+
+ -- Scott Kitterman <scott at kitterman.com>  Tue, 22 Jun 2010 12:23:24 -0400
+
 python-dns (2.3.4-3) unstable; urgency=low
 
   * Replace debian/patches/lazy-revlookup.diff with a better patch from

Modified: packages/python-dns/trunk/debian/control
===================================================================
--- packages/python-dns/trunk/debian/control	2010-06-22 22:15:14 UTC (rev 13548)
+++ packages/python-dns/trunk/debian/control	2010-06-22 23:57:27 UTC (rev 13549)
@@ -3,21 +3,20 @@
 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 (>= 5.0.37.1), python, cdbs (>= 0.4.41), python-central (>= 0.6~)
+Build-Depends: debhelper (>= 7.3.16), python (>= 2.6.5-2~), quilt (>= 0.46-7)
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-dns/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-dns/trunk/
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/pydns/
 XS-Python-Version: >= 2.3
-XS-DM-Upload-Allowed: yes
 
 Package: python-dns
 Architecture: all
 XB-Python-Version: >= 2.3
 Depends: ${misc:Depends}, ${python:Depends}
-Description: pydns - DNS client module for Python
+Description: DNS client module for Python
  This Python module provides an DNS API for looking up DNS entries from
  within Python modules and applications. This module is a simple, lightweight
  implementation. It is not as complete as python-dnspython, but is useful for
- most common applications.
+ many common applications.
 

Modified: packages/python-dns/trunk/debian/patches/examples-interpreter.diff
===================================================================
--- packages/python-dns/trunk/debian/patches/examples-interpreter.diff	2010-06-22 22:15:14 UTC (rev 13548)
+++ packages/python-dns/trunk/debian/patches/examples-interpreter.diff	2010-06-22 23:57:27 UTC (rev 13549)
@@ -1,33 +1,39 @@
-diff -Nur -x '*.orig' -x '*~' python-dns-2.3.4/tests/test5.py python-dns-2.3.4.new/tests/test5.py
---- python-dns-2.3.4/tests/test5.py	2007-05-22 16:25:53.000000000 -0400
-+++ python-dns-2.3.4.new/tests/test5.py	2010-01-17 14:00:30.000000000 -0500
+This is a distro patch that should go upstream.
+
+Index: python-dns-2.3.4/tests/test5.py
+===================================================================
+--- python-dns-2.3.4.orig/tests/test5.py	2010-06-22 19:42:02.511828022 -0400
++++ python-dns-2.3.4/tests/test5.py	2010-06-22 19:44:04.687816864 -0400
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python/
 +#!/usr/bin/python
  
  import sys ; sys.path.insert(0, '..')
  
-diff -Nur -x '*.orig' -x '*~' python-dns-2.3.4/tests/testPackers.py python-dns-2.3.4.new/tests/testPackers.py
---- python-dns-2.3.4/tests/testPackers.py	2002-03-19 07:40:58.000000000 -0500
-+++ python-dns-2.3.4.new/tests/testPackers.py	2010-01-17 14:00:18.000000000 -0500
+Index: python-dns-2.3.4/tests/testPackers.py
+===================================================================
+--- python-dns-2.3.4.orig/tests/testPackers.py	2010-06-22 19:42:41.299817420 -0400
++++ python-dns-2.3.4/tests/testPackers.py	2010-06-22 19:44:04.691817302 -0400
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
  
  #
  # Tests of the packet assembler/disassembler routines.
-diff -Nur -x '*.orig' -x '*~' python-dns-2.3.4/tests/testsrv.py python-dns-2.3.4.new/tests/testsrv.py
---- python-dns-2.3.4/tests/testsrv.py	2007-05-22 16:25:53.000000000 -0400
-+++ python-dns-2.3.4.new/tests/testsrv.py	2010-01-17 14:00:18.000000000 -0500
+Index: python-dns-2.3.4/tests/testsrv.py
+===================================================================
+--- python-dns-2.3.4.orig/tests/testsrv.py	2010-06-22 19:43:13.818817253 -0400
++++ python-dns-2.3.4/tests/testsrv.py	2010-06-22 19:44:04.691817302 -0400
 @@ -1,4 +1,4 @@
 -#!usr/bin/python
 +#!/usr/bin/python
  
  import sys ; sys.path.insert(0, '..')
  
-diff -Nur -x '*.orig' -x '*~' python-dns-2.3.4/tools/named-perf.py python-dns-2.3.4.new/tools/named-perf.py
---- python-dns-2.3.4/tools/named-perf.py	2001-07-19 02:43:15.000000000 -0400
-+++ python-dns-2.3.4.new/tools/named-perf.py	2010-01-17 14:00:18.000000000 -0500
+Index: python-dns-2.3.4/tools/named-perf.py
+===================================================================
+--- python-dns-2.3.4.orig/tools/named-perf.py	2010-06-22 19:43:34.207819339 -0400
++++ python-dns-2.3.4/tools/named-perf.py	2010-06-22 19:44:04.691817302 -0400
 @@ -1,4 +1,4 @@
 -#!/opt/python/bin/python
 +#!/usr/bin/python

Modified: packages/python-dns/trunk/debian/patches/lazy-revlookup.diff
===================================================================
--- packages/python-dns/trunk/debian/patches/lazy-revlookup.diff	2010-06-22 22:15:14 UTC (rev 13548)
+++ packages/python-dns/trunk/debian/patches/lazy-revlookup.diff	2010-06-22 23:57:27 UTC (rev 13549)
@@ -1,6 +1,10 @@
-diff -Nur -x '*.orig' -x '*~' python-dns-2.3.4/DNS/lazy.py python-dns-2.3.4.new/DNS/lazy.py
---- python-dns-2.3.4/DNS/lazy.py	2007-05-22 16:23:38.000000000 -0400
-+++ python-dns-2.3.4.new/DNS/lazy.py	2010-04-14 19:59:56.000000000 -0400
+This is a distro patch that has been sent upstream to the pydns bug tracker on
+sourceforge.
+
+Index: python-dns-2.3.4/DNS/lazy.py
+===================================================================
+--- python-dns-2.3.4.orig/DNS/lazy.py	2010-06-22 19:45:33.246817104 -0400
++++ python-dns-2.3.4/DNS/lazy.py	2010-06-22 19:45:45.766828728 -0400
 @@ -10,6 +10,9 @@
  import Base
  import string

Deleted: packages/python-dns/trunk/debian/pycompat
===================================================================
--- packages/python-dns/trunk/debian/pycompat	2010-06-22 22:15:14 UTC (rev 13548)
+++ packages/python-dns/trunk/debian/pycompat	2010-06-22 23:57:27 UTC (rev 13549)
@@ -1 +0,0 @@
-2

Modified: packages/python-dns/trunk/debian/rules
===================================================================
--- packages/python-dns/trunk/debian/rules	2010-06-22 22:15:14 UTC (rev 13548)
+++ packages/python-dns/trunk/debian/rules	2010-06-22 23:57:27 UTC (rev 13549)
@@ -1,15 +1,13 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM=pycentral
-DEB_COMPRESS_EXCLUDE := .py
+%:
+	dh $@ --with quilt, --with python2
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
-clean::
+override_dh_clean:
 	rm -f DNS/*.pyc
+	dh_clean
 
-install/python-dns::
+override_dh_install:
 	find debian/python-dns -name win32dns.py | xargs rm -f
+	dh_install

More information about the Python-modules-commits mailing list