[Python-modules-commits] r22589 - in packages/python-networkx/trunk/debian (changelog rules)

[morph at users.alioth.debian.org]

    Date: Tuesday, August 28, 2012 @ 09:06:49
  Author: morph
Revision: 22589

* debian/rules
  - reorganize build and test targets

Modified:
  packages/python-networkx/trunk/debian/changelog
  packages/python-networkx/trunk/debian/rules

Modified: packages/python-networkx/trunk/debian/changelog
===================================================================
--- packages/python-networkx/trunk/debian/changelog	2012-08-27 22:49:57 UTC (rev 22588)
+++ packages/python-networkx/trunk/debian/changelog	2012-08-28 09:06:49 UTC (rev 22589)
@@ -2,8 +2,10 @@
 
   * debian/*_objects.inv
     - updated intersphinx mapping files
+  * debian/rules
+    - reorganize build and test targets
 
- -- Sandro Tosi <morph at debian.org>  Tue, 28 Aug 2012 00:49:46 +0200
+ -- Sandro Tosi <morph at debian.org>  Tue, 28 Aug 2012 11:06:24 +0200
 
 python-networkx (1.7-1) experimental; urgency=low
 

Modified: packages/python-networkx/trunk/debian/rules
===================================================================
--- packages/python-networkx/trunk/debian/rules	2012-08-27 22:49:57 UTC (rev 22588)
+++ packages/python-networkx/trunk/debian/rules	2012-08-28 09:06:49 UTC (rev 22589)
@@ -21,20 +21,21 @@
 	# This directory is generated during the build
 	rm -rf networkx.egg-info
 
-build: build-arch build-indep ;
+override_dh_auto_build:
+	dh_auto_build
 
-build-arch:
-	dh build
+	# build doc, run in a separate shell, so we can export MPLCONFIGDIR
+	(export MPLCONFIGDIR=. ; make -C doc dist PYTHONPATH=../$(PYLIBPATH))
 
+override_dh_auto_test:
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
+	set -e ; \
 	# running tests
 	for py in $(shell pyversions -r) ; do\
 		PYTHONPATH=$(PYLIBPATH) $$py setup_egg.py nosetests ; \
 	done
+endif
 
-build-indep:
-	# build doc, run in a separate shell, so we can export MPLCONFIGDIR
-	(export MPLCONFIGDIR=. ; make -C doc dist PYTHONPATH=../$(PYLIBPATH))
-
 override_dh_install:
 	# Install w/o compiling *.pyc files
 	# Install egg-info directories (--single-... option)