[debian] py3k: update debian rules with new debhelper API

8 files changed, 37 insertions, 64 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 60dba3b4..af322248 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
 include ChangeLog
-include README
+include README*
 include COPYING
 include COPYING.LESSER
 include test/fulltest.sh
diff --git a/debian.hardy/rules b/debian.hardy/rules
index 5af83b1d..228a8ea7 100755
--- a/debian.hardy/rules
+++ b/debian.hardy/rules
@@ -5,7 +5,7 @@
 # adapted by Logilab for automatic generation by debianize
 # (part of the devtools project, http://www.logilab.org/projects/devtools)
 #
-# Copyright (c) 2003-2005 LOGILAB S.A. (Paris, FRANCE).
+# Copyright (c) 2003-2010 LOGILAB S.A. (Paris, FRANCE).
 # http://www.logilab.fr/ -- mailto:contact@logilab.fr
 
 # Uncomment this to turn on verbose mode.
diff --git a/debian.intrepid/rules b/debian.intrepid/rules
index 5af83b1d..228a8ea7 100755
--- a/debian.intrepid/rules
+++ b/debian.intrepid/rules
@@ -5,7 +5,7 @@
 # adapted by Logilab for automatic generation by debianize
 # (part of the devtools project, http://www.logilab.org/projects/devtools)
 #
-# Copyright (c) 2003-2005 LOGILAB S.A. (Paris, FRANCE).
+# Copyright (c) 2003-2010 LOGILAB S.A. (Paris, FRANCE).
 # http://www.logilab.fr/ -- mailto:contact@logilab.fr
 
 # Uncomment this to turn on verbose mode.
diff --git a/debian.lenny/rules b/debian.lenny/rules
index 5af83b1d..228a8ea7 100755
--- a/debian.lenny/rules
+++ b/debian.lenny/rules
@@ -5,7 +5,7 @@
 # adapted by Logilab for automatic generation by debianize
 # (part of the devtools project, http://www.logilab.org/projects/devtools)
 #
-# Copyright (c) 2003-2005 LOGILAB S.A. (Paris, FRANCE).
+# Copyright (c) 2003-2010 LOGILAB S.A. (Paris, FRANCE).
 # http://www.logilab.fr/ -- mailto:contact@logilab.fr
 
 # Uncomment this to turn on verbose mode.
diff --git a/debian.py3k/control b/debian.py3k/control
index b1353379..dc744bd0 100644
--- a/debian.py3k/control
+++ b/debian.py3k/control
@@ -1,27 +1,27 @@
 Source: logilab-astng
 Section: python
 Priority: optional
-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
-Uploaders: Sylvain Thénault <sylvain.thenault@logilab.fr>, Alexandre Fayolle <afayolle@debian.org>, Sandro Tosi <morph@debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), python3
-Build-Depends-Indep: python-support
-XS-Python-Version: all
-Standards-Version: 3.8.2
+Maintainer: Logilab S.A. <contact@logilab.fr>
+Uploaders: Sylvain Thénault <sylvain.thenault@logilab.fr>,
+	   Alexandre Fayolle <afayolle@debian.org>,
+	   Sandro Tosi <morph@debian.org>,
+	   Julien Jehannet <julien.jehannet@logilab.fr>
+Build-Depends: debhelper (>= 7.0.50~), python3-all
+Standards-Version: 3.9.1
 Homepage: http://www.logilab.org/project/logilab-astng
-Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/logilab-astng/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/logilab-astng/trunk/
+Vcs-Hg: http://hg.logilab.org/logilab/astng
+Vcs-Browser: http://hg.logilab.org/logilab/astng
 
 Package: python3-logilab-astng
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python3-logilab-common (>= 0.52.1-1)
-XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends}, ${misc:Depends}, python3-logilab-common
 Description: rebuild a new abstract syntax tree from Python's ast
  The aim of this module is to provide a common base representation of
  Python source code for projects such as pyreverse or pylint.
  .
- It rebuilds the tree generated by the _ast module by recursively walking down the
- AST and building an extended ast (let's call it astng ;). The new node classes
- have additional methods and attributes for different usages.
+ It rebuilds the tree generated by the _ast module by recursively walking down
+ the AST and building an extended ast (let's call it astng ;). The new node
+ classes have additional methods and attributes for different usages.
  Furthermore, astng builds partial trees by inspecting living objects.
 
 
diff --git a/debian.py3k/rules b/debian.py3k/rules
index 0e4279a1..e6fbca35 100755
--- a/debian.py3k/rules
+++ b/debian.py3k/rules
@@ -5,68 +5,41 @@
 # adapted by Logilab for automatic generation by debianize
 # (part of the devtools project, http://www.logilab.org/projects/devtools)
 #
-# Copyright (c) 2003-2008 LOGILAB S.A. (Paris, FRANCE).
+# Copyright (c) 2003-2010 LOGILAB S.A. (Paris, FRANCE).
 # http://www.logilab.fr/ -- mailto:contact@logilab.fr
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 PACKAGE:=$(shell grep Package debian/control | cut -d ' ' -f2)
+PYDEF:=$(shell py3versions -dv)
 
+include /usr/share/python3/python.mk
 
-include /usr/share/python/python.mk
 
-build: build-stamp
+%:
+	dh --with python3 --without python2 $@
 
-build-stamp:
-	dh_testdir
-	touch build-stamp
-
-
-clean:
-	dh_testdir
-	dh_testroot
-
-	NO_SETUPTOOLS=1 python setup.py clean
-	[ ! -d build ] || rm -rf build
-	find . -name "*.pyc" -delete
-	dh_clean build-stamp
-
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
+override_dh_auto_build:
+	# python module build
+	2to3-$(PYDEF) -wnv -x import setup.py
 
+override_dh_install:
 	NO_SETUPTOOLS=1 python3 setup.py -q install --no-compile \
 		--root=$(CURDIR)/debian/$(PACKAGE)/ \
 		${py_setup_install_args}
-	find $(CURDIR)/debian/$(PACKAGE)/usr/lib/python*/*-packages/ ! -path "*/test/*py" -name "*py" -exec 2to3-3.1 -wn {} \;
-
+	# transform python2 sources to python3
+	find $(CURDIR)/debian/$(PACKAGE)/usr/lib/python*/*-packages/ ! -path "*/test/*py" -name "*py" -exec 2to3-$(PYDEF) -wn {} \;
 	# remove test directory
 	rm -rf debian/$(PACKAGE)/usr/lib/python*/*-packages/logilab/astng/test
 	rm -rf debian/$(PACKAGE)/usr/lib/python*/*-packages/logilab/__init__.py
 
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_install -i
-	dh_pysupport -i
-	dh_installchangelogs -i ChangeLog
-	dh_installexamples -i
-	dh_installdocs -i README
-	dh_installman -i
-	dh_link -i
-	dh_compress -i -X.py -X.ini -X.xml -Xtest/
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
+override_dh_pysupport:
+	dh_python3 -V "$(PYDEF)-" --suggests=python3
 
-binary-arch:
+override_dh_installdocs:
+	dh_installdocs -i README*
+	dh_installchangelogs -i ChangeLog
 
-binary: binary-indep
-.PHONY: build clean binary binary-indep binary-arch
+override_dh_compress:
+	dh_compress -i -X.py -X.ini -X.xml -Xtest/
diff --git a/debian/rules b/debian/rules
index f05039ea..9734c9b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 # adapted by Logilab for automatic generation by debianize
 # (part of the devtools project, http://www.logilab.org/projects/devtools)
 #
-# Copyright (c) 2003-2005 LOGILAB S.A. (Paris, FRANCE).
+# Copyright (c) 2003-2010 LOGILAB S.A. (Paris, FRANCE).
 # http://www.logilab.fr/ -- mailto:contact@logilab.fr
 
 # Uncomment this to turn on verbose mode.
diff --git a/test/unittest_inspector.py b/test/unittest_inspector.py
index c156eb04..c149343d 100644
--- a/test/unittest_inspector.py
+++ b/test/unittest_inspector.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2006 LOGILAB S.A. (Paris, FRANCE).
+# Copyright (c) 2003-2010 LOGILAB S.A. (Paris, FRANCE).
 # http://www.logilab.fr/ -- mailto:contact@logilab.fr
 #
 # This program is free software; you can redistribute it and/or modify it under