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

Sat Nov 7 11:45:42 UTC 2009

Date: Saturday, November 7, 2009 @ 11:45:42
  Author: jandd
Revision: 10318

packaging improvements

 * debhelper 7 rules
 * fix lintian warnings
 * improve Dependencies and description
 * prepare for upload

Added:
  packages/python-adns/trunk/debian/compat
Modified:
  packages/python-adns/trunk/debian/changelog
  packages/python-adns/trunk/debian/control
  packages/python-adns/trunk/debian/rules
Deleted:
  packages/python-adns/trunk/debian/pycompat

Modified: packages/python-adns/trunk/debian/changelog
===================================================================

--- packages/python-adns/trunk/debian/changelog	2009-11-06 22:32:23 UTC (rev 10317)
+++ packages/python-adns/trunk/debian/changelog	2009-11-07 11:45:42 UTC (rev 10318)
@@ -1,7 +1,7 @@
-python-adns (1.2.1-1) UNRELEASED; urgency=low
+python-adns (1.2.1-1) unstable; urgency=low
 
-  * NOT RELEASED YET
   * New upstream release
+  * switch to debhelper7
   * add debian/watch file
   * debian/control:
     - new maintainer Debian Python Modules Team (Closes: #553073)
@@ -10,17 +10,26 @@
     - add Homepage
     - add Vcs-* fields
     - add quilt to Build-Depends
+    - fix spelling error in Description
+    - improve Description
+    - add ${misc:Depends} to Depends
+    - update debhelper and python-support dependencies
+    - update Standards-Version to 3.8.3 (no changes necessary)
   * remove direct modifications to orig tarball
   * add debian/README.source with quilt instructions
   * add debian/patches/01remove_shebang.patch instead of overwriting
     upstream ADNS.py
+  * add debian/compat
+  * remove debian/pycompat
   * debian/rules:
-    - add quilt macros to patch and unpatch
+    - use dh7 rules and overrides
+    - use --install-layout=deb
+    - use --with-quilt for automatic patching and unpatching
   * debian/copyright:
     - update copyright file to reflect changes in upstream URL as well as
       Debian maintenance
 
- -- Jan Dittberner <jandd at debian.org>  Wed, 04 Nov 2009 23:34:37 +0100
+ -- Jan Dittberner <jandd at debian.org>  Sat, 07 Nov 2009 12:40:55 +0100
 
 python-adns (1.1.0-3.1) unstable; urgency=low
 

Added: packages/python-adns/trunk/debian/compat
===================================================================
--- packages/python-adns/trunk/debian/compat	                        (rev 0)
+++ packages/python-adns/trunk/debian/compat	2009-11-07 11:45:42 UTC (rev 10318)
@@ -0,0 +1 @@
+7

Modified: packages/python-adns/trunk/debian/control
===================================================================
--- packages/python-adns/trunk/debian/control	2009-11-06 22:32:23 UTC (rev 10317)
+++ packages/python-adns/trunk/debian/control	2009-11-07 11:45:42 UTC (rev 10318)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Jan Dittberner <jandd at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11),
- python-support (>= 0.3.2), libadns1-dev, quilt
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.3.5-11),
+ python-support (>= 1.0.2), libadns1-dev (>= 1.2), quilt
+Standards-Version: 3.8.3
 XS-Python-Version: >= 2.3
 Homepage: http://code.google.com/p/adns-python/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-adns/trunk
@@ -13,11 +13,17 @@
 
 Package: python-adns
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: python2.3-adns (<< 1.0.0-6.2), python2.4-adns (<< 1.0.0-6.2)
 Replaces: python2.3-adns (<< 1.0.0-6.2), python2.4-adns (<< 1.0.0-6.2)
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Python bindings to the asynchronous DNS resolver library
- This module provides a python binding to the adns asynchronous DNS resolver
- library.
+ This module provides a Python binding to the adns asynchronous DNS
+ resolver library.
+ .
+ The module provides a small wrapper adns that simply returns status
+ codes as does the C library. It also provides a more Python like
+ interface ADNS that wraps status codes in proper exceptions.
+ .
+ The package contains working examples in ADNS.py and DNSBL.py.

Deleted: packages/python-adns/trunk/debian/pycompat
===================================================================
--- packages/python-adns/trunk/debian/pycompat	2009-11-06 22:32:23 UTC (rev 10317)
+++ packages/python-adns/trunk/debian/pycompat	2009-11-07 11:45:42 UTC (rev 10318)
@@ -1 +0,0 @@
-2

Modified: packages/python-adns/trunk/debian/rules
===================================================================
--- packages/python-adns/trunk/debian/rules	2009-11-06 22:32:23 UTC (rev 10317)
+++ packages/python-adns/trunk/debian/rules	2009-11-07 11:45:42 UTC (rev 10318)
@@ -1,88 +1,27 @@
 #!/usr/bin/make -f
-# Based on a sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-include /usr/share/quilt/quilt.make
-export DH_COMPAT=5
+PYVERSIONS=`pyversions -r`
 
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
+override_dh_auto_clean:
+	for python in ${PYVERSIONS}; do \
+		$$python setup.py clean; \
+	done
 
-PYVERS=$(shell pyversions -r)
-
-build: build-stamp patch
-build-stamp: 
-	dh_testdir
-	set -e; \
-	for python in $(PYVERS); do \
+override_dh_auto_build:
+	for python in ${PYVERSIONS}; do \
 		$$python setup.py build; \
 	done
-	touch build-stamp
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-
-	set -e; \
-	for python in $(PYVERS); do \
-		$$python setup.py clean; \
+override_dh_auto_install:
+	for python in ${PYVERSIONS}; do \
+		$$python setup.py install --root=$(CURDIR)/debian/python-adns --install-layout=deb; \
 	done
-	-rm -fr build build-stamp *.pyc
 
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-#	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp
-	set -e; \
-	for python in $(PYVERS); do \
-		$$python setup.py install --root=debian/python-adns; \
-	done
-
-# Build architecture-independent files here.
-binary-indep:
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-#	dh_movefiles
-
-#	dh_installdebconf	
+override_dh_installdocs:
 	dh_installdocs -a README
-	dh_installmenu -a
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installman -a
-#	dh_installinfo -a
-#	dh_undocumented
-	dh_installchangelogs -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_makeshlibs -a
-	dh_pysupport -a
-	dh_python -a
-	dh_installdeb
-#	dh_perl -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+%:
+	dh --with-quilt $@


