[Python-modules-commits] r7279 - in packages/pywavelets/trunk/debian (6 files)

[piotr at users.alioth.debian.org]

    Date: Tuesday, January 6, 2009 @ 18:30:57
  Author: piotr
Revision: 7279

* New upstream snapshot
* Add get-orig-source rule
* Use setup.py to build the package - python2.5 will create .egg-info during the build
* Cython added to Build-Depends
* Use Pyrex to build sources as new Cython package is not available yet
  + python-pyrex added to Build-Depends
  + use_pyrex_to_build_module patch added

Added:
  packages/pywavelets/trunk/debian/patches/
  packages/pywavelets/trunk/debian/patches/series
  packages/pywavelets/trunk/debian/patches/use_pyrex_to_build_module.patch
Modified:
  packages/pywavelets/trunk/debian/changelog
  packages/pywavelets/trunk/debian/control
  packages/pywavelets/trunk/debian/rules

Modified: packages/pywavelets/trunk/debian/changelog
===================================================================
--- packages/pywavelets/trunk/debian/changelog	2009-01-06 07:50:40 UTC (rev 7278)
+++ packages/pywavelets/trunk/debian/changelog	2009-01-06 18:30:57 UTC (rev 7279)
@@ -1,10 +1,20 @@
-pywavelets (0.1.7~svn97-2) UNRELEASED; urgency=low
+pywavelets (0.1.7~svn109-1) UNRELEASED; urgency=low
 
-  * debian/control
-    - switch Vcs-Browser field to viewsvn
+  [ Sandro Tosi ]
+  * Switch Vcs-Browser field to viewsvn
 
- -- Sandro Tosi <morph at debian.org>  Mon, 03 Nov 2008 22:16:15 +0100
+  [ Piotr Ożarowski ]
+  * New upstream snapshot
+  * Add get-orig-source rule
+  * Use setup.py to build the package - python2.5 will create .egg-info during
+    the build
+  * Cython added to Build-Depends
+  * Use Pyrex to build sources as new Cython package is not available yet
+    + python-pyrex added to Build-Depends
+    + use_pyrex_to_build_module patch added
 
+ -- Piotr Ożarowski <piotr at debian.org>  Tue, 06 Jan 2009 18:24:17 +0100
+
 pywavelets (0.1.7~svn97-1) unstable; urgency=medium
 
   [ Piotr Ożarowski ]

Modified: packages/pywavelets/trunk/debian/control
===================================================================
--- packages/pywavelets/trunk/debian/control	2009-01-06 07:50:40 UTC (rev 7278)
+++ packages/pywavelets/trunk/debian/control	2009-01-06 18:30:57 UTC (rev 7279)
@@ -4,7 +4,7 @@
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 5.0.38), python (>= 2.3.5-11), python-all-dev, python-central (>= 0.6.1),
- python-setuptools (>= 0.6b3-1~), python-numpy (>= 1:0.9.8-2)
+ python-setuptools (>= 0.6b3-1~), python-numpy (>= 1:0.9.8-2), quilt (>= 0.40), python-pyrex, cython
 Standards-Version: 3.8.0
 Homepage: http://www.pybytes.com/pywavelets/
 XS-Python-Version: >= 2.4

Added: packages/pywavelets/trunk/debian/patches/series
===================================================================
--- packages/pywavelets/trunk/debian/patches/series	                        (rev 0)
+++ packages/pywavelets/trunk/debian/patches/series	2009-01-06 18:30:57 UTC (rev 7279)
@@ -0,0 +1 @@
+use_pyrex_to_build_module.patch

Added: packages/pywavelets/trunk/debian/patches/use_pyrex_to_build_module.patch
===================================================================
--- packages/pywavelets/trunk/debian/patches/use_pyrex_to_build_module.patch	                        (rev 0)
+++ packages/pywavelets/trunk/debian/patches/use_pyrex_to_build_module.patch	2009-01-06 18:30:57 UTC (rev 7279)
@@ -0,0 +1,14 @@
+switch to pyrex untill we'll have recent version of cython
+Index: pywavelets-0.1.7~svn109/setup.py
+===================================================================
+--- pywavelets-0.1.7~svn109.orig/setup.py
++++ pywavelets-0.1.7~svn109/setup.py
+@@ -10,7 +10,7 @@ import util.templating
+ if os.path.exists('MANIFEST'):
+     os.remove('MANIFEST')
+ 
+-compiler = "cython" # "pyrex"
++compiler = "pyrex" # "cython"
+ try:
+     if compiler == "cython":
+         from Cython.Distutils import build_ext

Modified: packages/pywavelets/trunk/debian/rules
===================================================================
--- packages/pywavelets/trunk/debian/rules	2009-01-06 07:50:40 UTC (rev 7278)
+++ packages/pywavelets/trunk/debian/rules	2009-01-06 18:30:57 UTC (rev 7279)
@@ -8,7 +8,9 @@
 PACKAGE_NAME=python-pywt
 MODULE_NAME=PyWavelets
 
-clean:
+include /usr/share/quilt/quilt.make
+
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -rf build build-stamp build-ext-*
@@ -18,19 +20,18 @@
 	dh_clean
 
 build: build-stamp
-build-stamp: $(PYVERS:%=build-ext-%)
+build-stamp: patch $(PYVERS:%=build-ext-%)
 	touch $@
-build-ext-%:
+build-ext-%: patch
 	dh_testdir
-	python$* setupegg.py build
+	python$* setup.py build
 	touch $@
 
 install: install-stamp
-install-stamp: build-stamp $(PYVERS:%=install-ext-%)
+install-stamp: patch build-stamp $(PYVERS:%=install-ext-%)
 install-ext-%:
-	python$* setupegg.py install \
-		--root $(CURDIR)/debian/$(PACKAGE_NAME) \
-		--single-version-externally-managed
+	python$* setup.py install \
+		--root $(CURDIR)/debian/$(PACKAGE_NAME)
 
 binary-indep:
 
@@ -52,4 +53,15 @@
 
 binary: binary-indep binary-arch
 
+get-orig-source:
+	REV=$(shell dpkg-parsechangelog | sed -rne 's,^Version: .*svn([^-]+).*,\1,p'); \
+	VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p'); \
+	if [ x$$REV = x ]; then \
+	 uscan --force-download --rename --download-version=$$VER --destdir=.; \
+	else \
+	 svn -q export -r $$REV http://wavelets.scipy.org/svn/multiresolution/pywt/trunk pywavelets-r$$REV && \
+         tar -zcf ./pywavelets_$$VER.orig.tar.gz pywavelets-r$$REV; \
+	 rm -rf pywavelets-r$$REV; \
+	fi
+
 .PHONY: clean binary-indep binary-arch binary