[Python-modules-commits] r7185 - in packages/python-graph/trunk/debian (6 files)

[morph at users.alioth.debian.org]

    Date: Friday, December 26, 2008 @ 14:00:40
  Author: morph
Revision: 7185

fix build system; run test at build time; add notice for examples execution

Added:
  packages/python-graph/trunk/debian/README.Debian
  packages/python-graph/trunk/debian/patches/20_fix_make_clean.dpatch
  packages/python-graph/trunk/debian/patches/30_fix_make_docs.dpatch
Modified:
  packages/python-graph/trunk/debian/control
  packages/python-graph/trunk/debian/patches/00list
  packages/python-graph/trunk/debian/rules

Added: packages/python-graph/trunk/debian/README.Debian
===================================================================
--- packages/python-graph/trunk/debian/README.Debian	                        (rev 0)
+++ packages/python-graph/trunk/debian/README.Debian	2008-12-26 14:00:40 UTC (rev 7185)
@@ -0,0 +1,2 @@
+In order to run examples, you have to install libgv-python, that it's listed in
+'Suggests' field.

Modified: packages/python-graph/trunk/debian/control
===================================================================
--- packages/python-graph/trunk/debian/control	2008-12-26 13:52:29 UTC (rev 7184)
+++ packages/python-graph/trunk/debian/control	2008-12-26 14:00:40 UTC (rev 7185)
@@ -3,8 +3,8 @@
 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 (>= 7), python, dpatch, python-epydoc
-Build-Depends-Indep: python-central
+Build-Depends: debhelper (>= 7), dpatch
+Build-Depends-Indep: python-central, python, python-epydoc
 Standards-Version: 3.8.0
 Homepage: http://code.google.com/p/python-graph/
 Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/python-graph/trunk/

Modified: packages/python-graph/trunk/debian/patches/00list
===================================================================
--- packages/python-graph/trunk/debian/patches/00list	2008-12-26 13:52:29 UTC (rev 7184)
+++ packages/python-graph/trunk/debian/patches/00list	2008-12-26 14:00:40 UTC (rev 7185)
@@ -1 +1,3 @@
 10_remove_doc_installation
+20_fix_make_clean
+30_fix_make_docs

Added: packages/python-graph/trunk/debian/patches/20_fix_make_clean.dpatch
===================================================================
--- packages/python-graph/trunk/debian/patches/20_fix_make_clean.dpatch	                        (rev 0)
+++ packages/python-graph/trunk/debian/patches/20_fix_make_clean.dpatch	2008-12-26 14:00:40 UTC (rev 7185)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_fix_make_clean.dpatch by Sandro Tosi <morph at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix "make clean" so not to abort if no pyc file is present and to remove
+## DP: only the contents of "docs/" (dir is required to be there by setup.py)
+
+ at DPATCH@
+diff -urNad python-graph~/Makefile python-graph/Makefile
+--- python-graph~/Makefile	2008-09-05 16:33:19.000000000 +0200
++++ python-graph/Makefile	2008-12-26 13:31:55.141719761 +0100
+@@ -11,7 +11,7 @@
+ 	gedit graph/*.py &
+ 
+ clean:
+-	rm -rf docs
++	rm -rf docs/*
+ 	rm -rf dist
+ 	rm -rf build
+-	rm graph/*.pyc
++	rm -f graph/*.pyc


Property changes on: packages/python-graph/trunk/debian/patches/20_fix_make_clean.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: packages/python-graph/trunk/debian/patches/30_fix_make_docs.dpatch
===================================================================
--- packages/python-graph/trunk/debian/patches/30_fix_make_docs.dpatch	                        (rev 0)
+++ packages/python-graph/trunk/debian/patches/30_fix_make_docs.dpatch	2008-12-26 14:00:40 UTC (rev 7185)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_fix_make_docs.dpatch by Sandro Tosi <morph at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix "make docs" to not depend on any py file (regenerate docs even if no
+## DP: source code has changed)
+
+ at DPATCH@
+diff -urNad python-graph~/Makefile python-graph/Makefile
+--- python-graph~/Makefile	2008-12-26 13:29:48.561721551 +0100
++++ python-graph/Makefile	2008-12-26 13:29:54.341719460 +0100
+@@ -3,7 +3,7 @@
+ install:
+ 	./setup.py install
+ 
+-docs: graph/*.py
++docs:
+ 	epydoc -v --no-frames --no-sourcecode --name="python-graph" --url="http://code.google.com/p/python-graph/" --no-private --html --css misc/epydoc.css -o docs graph/*.py
+ 
+ edit: graph/*.py


Property changes on: packages/python-graph/trunk/debian/patches/30_fix_make_docs.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/python-graph/trunk/debian/rules
===================================================================
--- packages/python-graph/trunk/debian/rules	2008-12-26 13:52:29 UTC (rev 7184)
+++ packages/python-graph/trunk/debian/rules	2008-12-26 14:00:40 UTC (rev 7185)
@@ -11,9 +11,13 @@
 	dh_testdir
 
 	# Add here commands to compile the package.
-	mkdir docs #they remove at clean time...
 	python setup.py build
 
+	# run tests
+	for test in misc/unittests-* ; do \
+	  PYTHONPATH=build/lib/ python $$test ; \
+	done
+
 	$(MAKE) docs
 
 	touch $@
@@ -23,7 +27,7 @@
 	dh_testroot
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
+	$(MAKE) clean
 
 	dh_clean build-stamp