[Python-modules-commits] r9459 - in packages/ipy/trunk/debian (changelog control pycompat rules)

[bzed at users.alioth.debian.org]

    Date: Tuesday, August 25, 2009 @ 15:53:46
  Author: bzed
Revision: 9459

* debian/pycompat:
  - Deleting file, not needed.
* debian/control, debian/rules:
  - Use the new dh to build the package.
  - Run the new test suite, which is provided by upstream since this
    version instead of the buggy docstring test.

Modified:
  packages/ipy/trunk/debian/changelog
  packages/ipy/trunk/debian/control
  packages/ipy/trunk/debian/rules
Deleted:
  packages/ipy/trunk/debian/pycompat

Modified: packages/ipy/trunk/debian/changelog
===================================================================
--- packages/ipy/trunk/debian/changelog	2009-08-25 15:39:39 UTC (rev 9458)
+++ packages/ipy/trunk/debian/changelog	2009-08-25 15:53:46 UTC (rev 9459)
@@ -6,8 +6,14 @@
 
   [ Bernd Zeimetz ]
   * New upstream version.
+  * debian/pycompat:
+    - Deleting file, not needed.
+  * debian/control, debian/rules:
+    - Use the new dh to build the package.
+    - Run the new test suite, which is provided by upstream since this
+      version instead of the buggy docstring test.
 
- -- Bernd Zeimetz <bzed at debian.org>  Tue, 25 Aug 2009 17:39:25 +0200
+ -- Bernd Zeimetz <bzed at debian.org>  Tue, 25 Aug 2009 17:52:03 +0200
 
 ipy (1:0.62-1) unstable; urgency=low
 

Modified: packages/ipy/trunk/debian/control
===================================================================
--- packages/ipy/trunk/debian/control	2009-08-25 15:39:39 UTC (rev 9458)
+++ packages/ipy/trunk/debian/control	2009-08-25 15:53:46 UTC (rev 9459)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Bernd Zeimetz <bzed at debian.org>, Morten Werner Forsbring <werner at debian.org>
-Build-Depends: debhelper (>= 5.0.37.1), python-all
-Build-Depends-Indep: python-support (>= 0.4), python-docutils
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 7.3.5), python-all
+Build-Depends-Indep: python-support (>= 0.7.1), python-docutils
+Standards-Version: 3.8.3
 Homepage: http://software.inl.fr/trac/trac.cgi/wiki/IPy
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/ipy/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/ipy/trunk/

Deleted: packages/ipy/trunk/debian/pycompat
===================================================================
--- packages/ipy/trunk/debian/pycompat	2009-08-25 15:39:39 UTC (rev 9458)
+++ packages/ipy/trunk/debian/pycompat	2009-08-25 15:53:46 UTC (rev 9459)
@@ -1 +0,0 @@
-2

Modified: packages/ipy/trunk/debian/rules
===================================================================
--- packages/ipy/trunk/debian/rules	2009-08-25 15:39:39 UTC (rev 9458)
+++ packages/ipy/trunk/debian/rules	2009-08-25 15:53:46 UTC (rev 9459)
@@ -3,81 +3,25 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-PKGNAME:=python-ipy
-PYVERS:=$(shell pyversions -r)
+PYTHONS:=$(shell pyversions -vr)
 
-build: build-stamp
-build-stamp:
-	dh_testdir
+%:
+	dh $@
 
-	set -e; \
-	for py in $(PYVERS); do  \
-	    $$py setup.py build; \
-	done
+IPy.html:
+	rst2html README IPy.html --stylesheet=rest.css
 
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	#test fails, disabled for now.
-	#set -e ;\
-	#cd test ;\
-	#for py in $(PYVERS); do  \
-	#    PYTHONPATH=$(CURDIR)/build/lib $$py test_IPy.py ;\
-	#done
+install: $(PYTHONS:%=test/test-%-stamp) IPy.html
+	dh $@
 
-	#runnign doctest
-	set -e ;\
-	for py in $(PYVERS); do  \
-	    PYTHONPATH=$(CURDIR)/build/lib $$py test_doc.py ;\
-	done
+test/test-%-stamp:
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	python$* test/test_IPy.py
+	touch $@
 endif
 
-	rst2html README IPy.html --stylesheet=rest.css
 
-	touch $@
+.PHONY: install get-orig-source
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f install-stamp build-stamp
-	-for py in $(PYVERS); do  \
-	    $$py setup.py clean; \
-	done
-	find . -name \*.pyc | xargs rm -f
-	rm -rf build IPy.html
-	dh_clean 
-
-install: install-stamp
-install-stamp:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	set -e; \
-	for py in $(PYVERS); do  \
-	    $$py setup.py install --root=debian/$(PKGNAME); \
-	done
-
-	dh_installdocs -A
-	dh_installexamples
-	touch install-stamp
-
-binary-arch: build install
-# We have nothing to do by default.
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_compress -X.py
-	dh_fixperms
-	dh_pysupport
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install get-orig-source
-
-
 get-orig-source:
 	uscan --verbose --force-download