[Python-modules-commits] r12637 - in packages/pysubnettree/trunk/debian (7 files)

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

    Date: Monday, April 19, 2010 @ 05:37:51
  Author: kitterma-guest
Revision: 12637

Fix build with python2.8 and switch from cdbs to dh7

Added:
  packages/pysubnettree/trunk/debian/python-subnettree.docs
Modified:
  packages/pysubnettree/trunk/debian/changelog
  packages/pysubnettree/trunk/debian/compat
  packages/pysubnettree/trunk/debian/control
  packages/pysubnettree/trunk/debian/rules
Deleted:
  packages/pysubnettree/trunk/debian/docs
  packages/pysubnettree/trunk/debian/pycompat

Modified: packages/pysubnettree/trunk/debian/changelog
===================================================================
--- packages/pysubnettree/trunk/debian/changelog	2010-04-19 04:29:36 UTC (rev 12636)
+++ packages/pysubnettree/trunk/debian/changelog	2010-04-19 05:37:51 UTC (rev 12637)
@@ -1,16 +1,20 @@
-pysubnettree (0.12-3) UNRELEASED; urgency=low
+pysubnettree (0.12-3) unstable; urgency=low
 
-  * Fix svn path to DPMT repository in debian/control
+  * Fix build for python2.6 so it works by switching from cdbs to dh7
+    (closes: 578339)
+    - Convert debian/rules to dh 7 
+    - Drop build-depends on cdbs
+    - Bump minimum debhelper version requirement to 7.4.12
+    - Add missing build-depends on swig
+    - Remove pycompat since it will no longer be regenerated by cdbs
+    - Renumate debian/docs to debian/python-subnettree.docs
+  * Change XS/XB-Python-Version from all to >= 2.4
+  * Bump standards version to 3.8.4 without further change
 
- -- Scott Kitterman <scott at kitterman.com>  Wed, 11 Nov 2009 17:04:10 -0500
+ -- Scott Kitterman <scott at kitterman.com>  Mon, 19 Apr 2010 00:35:05 -0400
 
 pysubnettree (0.12-2) unstable; urgency=low
 
-  [ Sandro Tosi ]
-  * debian/control
-    - Switch Vcs-Browser field to viewsvn
-
-  [ Scott Kitterman ]
   * Fix debian/rules to build for all supported Python versions
   * Prepare for Python 2.6
     - Add install-layout=deb to setup.py install rule
@@ -19,7 +23,6 @@
   * Bump standards version to 3.8.3 without further change
   * Add ${misc:Depends} for python-subnettree
   * Fix use of copyright symbol in debian/copyright
-  * Fix svn path to DPMT repository in debian/control
 
  -- Scott Kitterman <scott at kitterman.com>  Mon, 02 Nov 2009 01:40:46 -0500
 

Modified: packages/pysubnettree/trunk/debian/compat
===================================================================
--- packages/pysubnettree/trunk/debian/compat	2010-04-19 04:29:36 UTC (rev 12636)
+++ packages/pysubnettree/trunk/debian/compat	2010-04-19 05:37:51 UTC (rev 12637)
@@ -1 +1 @@
-5
+7

Modified: packages/pysubnettree/trunk/debian/control
===================================================================
--- packages/pysubnettree/trunk/debian/control	2010-04-19 04:29:36 UTC (rev 12636)
+++ packages/pysubnettree/trunk/debian/control	2010-04-19 05:37:51 UTC (rev 12637)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Scott Kitterman <scott at kitterman.com>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.1), python-all-dev (>= 2.5.4-2~), python-central (>= 0.6)
-XS-Python-Version: all
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.4.12), python-all-dev (>= 2.5.4-2~), python-central (>= 0.6), swig
+XS-Python-Version: >= 2.4
+Standards-Version: 3.8.4
 Homepage: http://www.icir.org/robin/pysubnettree/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pysubnettree/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/pysubnettree/trunk/?op=log
@@ -15,7 +15,7 @@
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
-XB-Python-Version: all
+XB-Python-Version: >= 2.4
 Description: Python Module for CIDR Lookups
  The PySubnetTree package provides a Python data structure SubnetTree which 
  maps subnets given in CIDR (Classless Inter-Domain Routing) notation to Python 

Deleted: packages/pysubnettree/trunk/debian/docs
===================================================================
--- packages/pysubnettree/trunk/debian/docs	2010-04-19 04:29:36 UTC (rev 12636)
+++ packages/pysubnettree/trunk/debian/docs	2010-04-19 05:37:51 UTC (rev 12637)
@@ -1 +0,0 @@
-README

Deleted: packages/pysubnettree/trunk/debian/pycompat
===================================================================
--- packages/pysubnettree/trunk/debian/pycompat	2010-04-19 04:29:36 UTC (rev 12636)
+++ packages/pysubnettree/trunk/debian/pycompat	2010-04-19 05:37:51 UTC (rev 12637)
@@ -1 +0,0 @@
-2

Added: packages/pysubnettree/trunk/debian/python-subnettree.docs
===================================================================
--- packages/pysubnettree/trunk/debian/python-subnettree.docs	                        (rev 0)
+++ packages/pysubnettree/trunk/debian/python-subnettree.docs	2010-04-19 05:37:51 UTC (rev 12637)
@@ -0,0 +1 @@
+README

Modified: packages/pysubnettree/trunk/debian/rules
===================================================================
--- packages/pysubnettree/trunk/debian/rules	2010-04-19 04:29:36 UTC (rev 12636)
+++ packages/pysubnettree/trunk/debian/rules	2010-04-19 05:37:51 UTC (rev 12637)
@@ -1,21 +1,4 @@
 #!/usr/bin/make -f
-# -*- mode: makefile; coding: utf-8 -*-
 
-DEB_PYTHON_SYSTEM=pycentral
-
-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
-include /usr/share/python/python.mk
-
-build/python-subnettree::
-	set -e; \
-	for i in $(shell pyversions -s); do \
-	  $i ./setup.py build; \
-	done
-
-install/python-subnettree::
-	for i in $(shell pyversions -s); do \
-	  $i ./setup.py install --install-layout=deb --root $(CURDIR)/debian/python-subnettree; \
-	done
-	rm -rf $(CURDIR)/debian/python-subnettree/usr/lib/python2.6/site-packages
+%:
+	dh $@ --buildsystem python_distutils --with python-central