[Python-modules-commits] r7944 - in packages/simpleparse/trunk/debian (7 files)

Sat Mar 21 12:47:19 UTC 2009

Date: Saturday, March 21, 2009 @ 12:47:18
  Author: bernat
Revision: 7944

Start to rework the package to works with python-support. Closes: #517309.

Added:
  packages/simpleparse/trunk/debian/runtests.py
Modified:
  packages/simpleparse/trunk/debian/changelog
  packages/simpleparse/trunk/debian/compat
  packages/simpleparse/trunk/debian/control
  packages/simpleparse/trunk/debian/python-simpleparse-mxtexttools.install
  packages/simpleparse/trunk/debian/python-simpleparse.install
  packages/simpleparse/trunk/debian/rules

Modified: packages/simpleparse/trunk/debian/changelog
===================================================================

--- packages/simpleparse/trunk/debian/changelog	2009-03-21 08:32:12 UTC (rev 7943)
+++ packages/simpleparse/trunk/debian/changelog	2009-03-21 12:47:18 UTC (rev 7944)
@@ -1,9 +1,16 @@
 simpleparse (2.1.0a1-3) UNRELEASED; urgency=low
 
+  [ Vincent Bernat ]
+  * Rework debian/rules to fix FTBFS with experimental version of
+    python-support and to not rely on python-support internals.
+    Closes: #517309.
+  * Bump Standards-Version to 3.8.1.
+
+  [ Sandro Tosi ]
   * debian/control
     - switch Vcs-Browser field to viewsvn
 
- -- Sandro Tosi <morph at debian.org>  Mon, 03 Nov 2008 22:16:30 +0100
+ -- Vincent Bernat <bernat at debian.org>  Sat, 21 Mar 2009 12:54:34 +0100
 
 simpleparse (2.1.0a1-2) unstable; urgency=low
 

Modified: packages/simpleparse/trunk/debian/compat
===================================================================
--- packages/simpleparse/trunk/debian/compat	2009-03-21 08:32:12 UTC (rev 7943)
+++ packages/simpleparse/trunk/debian/compat	2009-03-21 12:47:18 UTC (rev 7944)
@@ -1 +1 @@
-5
+7

Modified: packages/simpleparse/trunk/debian/control
===================================================================
--- packages/simpleparse/trunk/debian/control	2009-03-21 08:32:12 UTC (rev 7943)
+++ packages/simpleparse/trunk/debian/control	2009-03-21 12:47:18 UTC (rev 7944)
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Vincent Bernat <bernat at debian.org>
-Build-Depends: debhelper (>=  5.0.37.2), cdbs (>= 0.4.43), python-all-dev (>= 2.3.5-11), python-support (>= 0.6.4), python-setuptools (>= 0.6b3), quilt, patchutils (>= 0.2.25)
+Build-Depends: debhelper (>=  7), cdbs (>= 0.4.43), python-all-dev (>= 2.3.5-11), python-support (>= 0.6.4), python-setuptools (>= 0.6b3), quilt, patchutils (>= 0.2.25)
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/simpleparse/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/simpleparse/trunk/
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Homepage: http://simpleparse.sourceforge.net/
 
 Package: python-simpleparse

Modified: packages/simpleparse/trunk/debian/python-simpleparse-mxtexttools.install
===================================================================
--- packages/simpleparse/trunk/debian/python-simpleparse-mxtexttools.install	2009-03-21 08:32:12 UTC (rev 7943)
+++ packages/simpleparse/trunk/debian/python-simpleparse-mxtexttools.install	2009-03-21 12:47:18 UTC (rev 7944)
@@ -1 +1 @@
-debian/tmp/usr/lib/python*/site-packages/simpleparse/stt/TextTools/mxTextTools/*
+usr/lib/python*/site-packages/simpleparse/stt/TextTools/mxTextTools/*

Modified: packages/simpleparse/trunk/debian/python-simpleparse.install
===================================================================
--- packages/simpleparse/trunk/debian/python-simpleparse.install	2009-03-21 08:32:12 UTC (rev 7943)
+++ packages/simpleparse/trunk/debian/python-simpleparse.install	2009-03-21 12:47:18 UTC (rev 7944)
@@ -1 +1,7 @@
-debian/tmp/*
+usr/lib/python*/site-packages/simpleparse/*.py
+usr/lib/python*/site-packages/simpleparse/common/*.py
+usr/lib/python*/site-packages/simpleparse/tests/*.py
+usr/lib/python*/site-packages/simpleparse/stt/*.py
+usr/lib/python*/site-packages/simpleparse/stt/TextTools/*.py
+usr/lib/python*/site-packages/simpleparse/stt/TextTools/Constants/*.py
+usr/lib/python*/site-packages/simpleparse/xml/*.py

Modified: packages/simpleparse/trunk/debian/rules
===================================================================
--- packages/simpleparse/trunk/debian/rules	2009-03-21 08:32:12 UTC (rev 7943)
+++ packages/simpleparse/trunk/debian/rules	2009-03-21 12:47:18 UTC (rev 7944)
@@ -6,36 +6,20 @@
 include /usr/share/cdbs/1/class/python-distutils.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-SHARE=$(CURDIR)/debian/python-simpleparse/usr/share
-
-binary-install/python-simpleparse::
-	# Remove binary-dependant files. They are in a separate package.
-	rm -rf $(CURDIR)/debian/python-simpleparse/usr/lib
-	rm -rf $(CURDIR)/debian/python-simpleparse/usr/share/python-support/python-simpleparse/simpleparse/stt/TextTools/mxTextTools/
-
-binary-predeb/python-simpleparse::
-	# Some cleaning
-	rm -rf $(SHARE)/python-support/python-simpleparse/simpleparse/examples
-	rm -rf $(SHARE)/python-support/python-simpleparse/simpleparse/doc
-	rm -rf $(SHARE)/python-support/python-simpleparse/simpleparse/stt/Doc
-	rm -rf $(SHARE)/python-support/python-simpleparse/simpleparse/stt/TextTools/LICENSE
-	rm -rf $(SHARE)/python-support/python-simpleparse/simpleparse/stt/TextTools/README
-	rm -rf $(SHARE)/python-support/python-simpleparse/simpleparse/stt/TextTools/COPYRIGHT
-	rm -rf $(SHARE)/python-support/python-simpleparse/simpleparse/stt/LICENSE
-	rm -rf $(SHARE)/python-support/python-simpleparse/simpleparse/stt/COPYRIGHT
-	rm -rf $(SHARE)/python-support/python-simpleparse/simpleparse/stt/mxLicense.html
-
-binary-predeb/python-simpleparse-doc::
-	chmod 0644 $(CURDIR)/debian/python-simpleparse-doc/usr/share/doc/python-simpleparse-doc/examples/*
-
+install/python-simpleparse::
+	for PY in $(shell pyversions -r); do \
+		mkdir -p debian/tmp/usr/lib/$$PY ; \
+		ln -s ../../../../../$$(echo $$(echo build/lib.*-$$(echo $$PY | sed 's/python//'))) \
+				debian/tmp/usr/lib/$$PY/site-packages ; \
+	done
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-binary-post-install/python-simpleparse::
-	ln -s ../test_printers_garbage.py tests/.
-	PYTHONPATH=$$(python -c 'import sys ; print "debian/tmp/usr/lib/python%d.%d/site-packages" % sys.version_info[:2]') \
-		python tests/test.py
-	rm -f tests/test_printers_garbage.py*
+	ln -s ../test_printers_garbage.py tests/test_printers_garbage.py
+	for PY in $(shell pyversions -r); do \
+			$$PY debian/runtests.py debian/tmp || exit 1 ; \
+	done
+	rm -f tests/test_printers_garbage.py
 endif
 
 clean::
-	rm -rf build
 	rm -f tests/test_printers_garbage.py
+	rm -rf build

Added: packages/simpleparse/trunk/debian/runtests.py
===================================================================
--- packages/simpleparse/trunk/debian/runtests.py	                        (rev 0)
+++ packages/simpleparse/trunk/debian/runtests.py	2009-03-21 12:47:18 UTC (rev 7944)
@@ -0,0 +1,15 @@
+import sys
+from os.path import join
+from distutils.sysconfig import get_python_lib
+from site import addsitedir
+
+root = sys.argv.pop(1)
+site_packages = get_python_lib()
+
+_path = sys.path[:]
+sys.path[:] = []
+addsitedir(join(root, site_packages[1:]))
+sys.path.extend(_path)
+sys.path.append("tests")
+
+execfile("tests/test.py")


