[Python-modules-commits] r14473 - in packages/python-networkx/trunk/debian (4 files)

[morph at users.alioth.debian.org]

    Date: Wednesday, September 22, 2010 @ 16:32:58
  Author: morph
Revision: 14473

* debian/{control, rules}
  - moved to dh7 and "reduced" rules file

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

Modified: packages/python-networkx/trunk/debian/changelog
===================================================================
--- packages/python-networkx/trunk/debian/changelog	2010-09-21 23:23:07 UTC (rev 14472)
+++ packages/python-networkx/trunk/debian/changelog	2010-09-22 16:32:58 UTC (rev 14473)
@@ -17,8 +17,10 @@
     - (d/control) define a new binary package, and add depends on sphinx (>= 1)
     - (d/rules) build documentation, install it into the new -doc package
     - (d/patches/30_use_local_objects.inv) use local copy of remote objects.inv
+  * debian/{control, rules}
+    - moved to dh7 and "reduced" rules file
 
- -- Sandro Tosi <morph at debian.org>  Tue, 21 Sep 2010 23:28:11 +0200
+ -- Sandro Tosi <morph at debian.org>  Wed, 22 Sep 2010 18:29:31 +0200
 
 python-networkx (1.1-2) unstable; urgency=low
 

Modified: packages/python-networkx/trunk/debian/compat
===================================================================
--- packages/python-networkx/trunk/debian/compat	2010-09-21 23:23:07 UTC (rev 14472)
+++ packages/python-networkx/trunk/debian/compat	2010-09-22 16:32:58 UTC (rev 14473)
@@ -1 +1 @@
-5
+7

Modified: packages/python-networkx/trunk/debian/control
===================================================================
--- packages/python-networkx/trunk/debian/control	2010-09-21 23:23:07 UTC (rev 14472)
+++ packages/python-networkx/trunk/debian/control	2010-09-22 16:32:58 UTC (rev 14473)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Sandro Tosi <morph at debian.org>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 7.0.50~)
 Build-Depends-Indep: python (>= 2.3.5-11), python-support (>= 1), python-setuptools (>= 0.6a9), python-nose (>= 0.10.1), python-sphinx (>= 1.0.0)
 Standards-Version: 3.9.1
 XS-Python-Version: >= 2.6

Modified: packages/python-networkx/trunk/debian/rules
===================================================================
--- packages/python-networkx/trunk/debian/rules	2010-09-21 23:23:07 UTC (rev 14472)
+++ packages/python-networkx/trunk/debian/rules	2010-09-22 16:32:58 UTC (rev 14473)
@@ -1,21 +1,13 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-PYSUPPORT_DIR=debian/python-networkx/usr/share/python-support/python-networkx
 DEBIANDOC_DIR=$(CURDIR)/debian/python-networkx/usr/share/doc/python-networkx
 
-clean:
-	dh_testdir
-	dh_testroot
+%:
+	dh $@
 
+override_dh_auto_clean:
+	dh_auto_clean
+
 	# Add here commands to clean up after the build process.
 	rm -fr build
 
@@ -25,18 +17,20 @@
 	# This directory is generated during the build
 	rm -rf networkx.egg-info
 
-	dh_clean
+build: build-arch build-indep ;
 
-install:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
+build-arch:
+	dh build
 
 	# running tests
 	# known to fail: https://networkx.lanl.gov/trac/ticket/431, 432
 	-python setup_egg.py nosetests
 
+build-indep:
+	# build doc
+	make -C doc html
+
+override_dh_install:
 	# Install w/o compiling *.pyc files
 	# Install egg-info directories (--single-... option)
 	python setup_egg.py install --no-compile --root=$(CURDIR)/debian/python-networkx \
@@ -56,33 +50,9 @@
 	rm -rf debian/python-networkx-doc/usr/share/doc/python-networkx-doc/html/_static/jquery.js
 	dh_link -ppython-networkx-doc /usr/share/javascript/jquery/jquery.js /usr/share/doc/python-networkx-doc/html/_static/jquery.js
 
-build:
-	make -C doc html
-
 update_intersphinx_mapping:
 	wget http://docs.python.org/dev/objects.inv -O debian/python.org_objects.inv
 	wget http://docs.scipy.org/doc/numpy/objects.inv -O debian/scipy.org_numpy_objects.inv
 
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-	dh_pysupport
-	dh_installman
-	dh_link
+override_dh_compress:
 	dh_compress -Xexamples/ -X.js
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install