[Python-modules-commits] r7438 - in packages/logilab-common/trunk/debian (changelog rules)

[morph at users.alioth.debian.org]

    Date: Wednesday, February 4, 2009 @ 23:57:14
  Author: morph
Revision: 7438

  - added test execution at build-time, simulating "logilab" is a real
    package; thanks Piotr!
  - build can't be used as dh_clean call (it's a dir), restored 'rm -rf'

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

Modified: packages/logilab-common/trunk/debian/changelog
===================================================================
--- packages/logilab-common/trunk/debian/changelog	2009-02-04 21:51:14 UTC (rev 7437)
+++ packages/logilab-common/trunk/debian/changelog	2009-02-04 23:57:14 UTC (rev 7438)
@@ -1,4 +1,4 @@
-logilab-common (0.38.0-1) UNRELEASED; urgency=low
+logilab-common (0.38.0-1) unstable; urgency=low
 
   * New upstream release
   * debian/watch
@@ -8,10 +8,12 @@
   * debian/copyright
     - updated upstream copyright information
   * debian/rules
-    - added test execution at build-time
+    - added test execution at build-time, simulating "logilab" is a real
+      package; thanks Piotr!
     - using --root at install-time
+    - build can't be used as dh_clean call (it's a dir), restored 'rm -rf'
 
- -- Sandro Tosi <morph at debian.org>  Wed, 04 Feb 2009 22:42:07 +0100
+ -- Sandro Tosi <morph at debian.org>  Thu, 05 Feb 2009 00:53:24 +0100
 
 logilab-common (0.37.2-2) unstable; urgency=low
 

Modified: packages/logilab-common/trunk/debian/rules
===================================================================
--- packages/logilab-common/trunk/debian/rules	2009-02-04 21:51:14 UTC (rev 7437)
+++ packages/logilab-common/trunk/debian/rules	2009-02-04 23:57:14 UTC (rev 7438)
@@ -20,7 +20,11 @@
 
 	# run tests
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	-PYTHONPATH=build/lib/ build/scripts-2.5/pytest
+	# we need this hack because we have to import "logilab.common.pytest"
+	# but since it's a namespace package, we need to "simulate" it
+	touch $(CURDIR)/build/lib/logilab/__init__.py
+	-PYTHONPATH=$(CURDIR)/build/lib/ $(CURDIR)/build/scripts-2.5/pytest
+	rm -f $(CURDIR)/build/lib/logilab/__init__.py
 endif
 
 	# build doc
@@ -37,9 +41,11 @@
 
 	python setup.py clean
 
+	[ ! -d build ] || rm -rf build
+
 	find . -name "*.pyc" -delete
 
-	dh_clean build-stamp build
+	dh_clean build-stamp
 
 install: build
 	dh_testdir