[Python-modules-commits] r22550 - in packages/logilab-common/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Tuesday, August 21, 2012 @ 16:07:23
  Author: morph
Revision: 22550

* debian/{control, rules}
  - switch to dh sequencer

Modified:
  packages/logilab-common/trunk/debian/changelog
  packages/logilab-common/trunk/debian/control
  packages/logilab-common/trunk/debian/rules

Modified: packages/logilab-common/trunk/debian/changelog
===================================================================
--- packages/logilab-common/trunk/debian/changelog	2012-08-21 07:24:09 UTC (rev 22549)
+++ packages/logilab-common/trunk/debian/changelog	2012-08-21 16:07:23 UTC (rev 22550)
@@ -1,3 +1,10 @@
+logilab-common (0.58.2-2) UNRELEASED; urgency=low
+
+  * debian/{control, rules}
+    - switch to dh sequencer
+
+ -- Sandro Tosi <morph at debian.org>  Tue, 21 Aug 2012 18:06:15 +0200
+
 logilab-common (0.58.2-1) experimental; urgency=low
 
   * New upstream release

Modified: packages/logilab-common/trunk/debian/control
===================================================================
--- packages/logilab-common/trunk/debian/control	2012-08-21 07:24:09 UTC (rev 22549)
+++ packages/logilab-common/trunk/debian/control	2012-08-21 16:07:23 UTC (rev 22550)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Julien Jehannet <julien.jehannet at logilab.fr>, Sandro Tosi <morph at debian.org>
-Build-Depends: debhelper (>= 5.0.38), python (>= 2.5.3-1~)
+Build-Depends: debhelper (>= 7.0.50~), python (>= 2.5.3-1~)
 Build-Depends-Indep: python-support, python-epydoc, graphviz, python-egenix-mxdatetime, python-unittest2
 XS-Python-Version: all
 Standards-Version: 3.9.3

Modified: packages/logilab-common/trunk/debian/rules
===================================================================
--- packages/logilab-common/trunk/debian/rules	2012-08-21 07:24:09 UTC (rev 22549)
+++ packages/logilab-common/trunk/debian/rules	2012-08-21 16:07:23 UTC (rev 22550)
@@ -1,12 +1,4 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-#
-# 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).
-# http://www.logilab.fr/ -- mailto:contact at logilab.fr
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -16,12 +8,10 @@
 # Python default version number
 PYDEF := $(shell pyversions -d -v)
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
-	dh_testdir
-	
+%:
+	dh $@
+
+override_dh_auto_build:
 	# python module build
 	NO_SETUPTOOLS=1 python setup.py -q build --build-purelib build/lib
 
@@ -30,66 +20,49 @@
 	# we need to "simulate" it
 	touch $(CURDIR)/build/lib/logilab/__init__.py
 
-	# run tests
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	# use the default python version to select the script dir to run the tests
-	PYTHONPATH=$(CURDIR)/build/lib/ $(CURDIR)/build/scripts-$(PYDEF)/pytest -t test
-endif
-
 	# build doc
 	$(MAKE) -C doc
 
 	# remove dummy file
 	rm -f $(CURDIR)/build/lib/logilab/__init__.py
 
-	touch build-stamp
+override_dh_auto_test:
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
+	# we need this hack because we have to import "logilab.common.pytest"
+	# and for doc generation, but since it's a namespace package,
+	# we need to "simulate" it
+	touch $(CURDIR)/build/lib/logilab/__init__.py
 
-clean:
-	dh_testdir
-	dh_testroot
-	
+	# run tests
+	# use the default python version to select the script dir to run the tests
+	PYTHONPATH=$(CURDIR)/build/lib/ $(CURDIR)/build/scripts-$(PYDEF)/pytest -t test
+
+	# remove dummy file
+	rm -f $(CURDIR)/build/lib/logilab/__init__.py
+endif
+
+override_dh_auto_clean:
 	# clean doc
 	$(MAKE) -C doc clean
 
 	NO_SETUPTOOLS=1 python setup.py clean
 
-	[ ! -d build ] || rm -rf build
-
 	find . -name "*.pyc" -delete
 
-	dh_clean build-stamp
+	dh_clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
+override_dh_auto_install: build
 	NO_SETUPTOOLS=1 python setup.py -q install --no-compile \
 		--root=$(CURDIR)/debian/python-logilab-common/ \
 		${py_setup_install_args}
 	# remove test directory
 	rm -rf debian/python-logilab-common/usr/lib/python*/*-packages/logilab/common/test
 
-# 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 doc/apidoc/
-	dh_installman -i
-	dh_link -i
-	dh_compress -i		-X.py -X.ini -X.xml -Xtest/ -Xapidoc/
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i 
-	dh_md5sums -i
-	dh_builddeb -i
+override_dh_installchangelogs:
+	dh_installchangelogs	ChangeLog
 
-binary-arch:
+override_dh_installdocs:
+	dh_installdocs		README doc/apidoc/
 
-binary: binary-indep
-.PHONY: build clean binary binary-indep binary-arch
+override_dh_compress:
+	dh_compress		-X.py -X.ini -X.xml -Xtest/ -Xapidoc/