[SCM] pyepr branch, master, updated. upstream/0.6-24-g2bba080

Antonio Valentino antonio.valentino at tiscali.it
Sun Mar 25 10:47:49 UTC 2012


The following commit has been merged in the master branch:
commit 9886d774bc6725b859cd7d706fc699283cf27220
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sun Mar 18 13:19:02 2012 +0100

    Provide packages for python3

diff --git a/debian/changelog b/debian/changelog
index 8a498d9..b606ee8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pyepr (0.6-2) unstable; urgency=low
+
+  * New packages for python3 (standatd and -dbg)
+  * use --with sphinxdoc in the dh sequencer call
+  * X-Python-Version moved to the source package section of the control file
+  * use the specific override_dh_installdocs for sphinx documentation
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 24 Mar 2012 21:39:35 +0100
+
 pyepr (0.6-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index caf949a..ef16635 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,15 @@ Section: python
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Antonio Valentino <antonio.valentino at tiscali.it>
-Build-Depends: python-all-dev, python-all-dbg, debhelper (>= 8.1.0~),
-               cython (>= 0.13), cython-dbg, python-numpy, python-numpy-dbg,
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
+Build-Depends: python-all-dev, python-all-dbg,
+               python3-all-dev, python3-all-dbg,
+               debhelper (>= 8.1.0~), cython (>= 0.13), cython-dbg,
+               python-numpy, python-numpy-dbg,
+               python3-numpy, python3-numpy-dbg,
                libepr-api2-dev (>= 2.2),
-               python-sphinx (>= 1.0), texlive-latex-extra
+               python-sphinx (>= 1.0.7+dfsg), texlive-latex-extra
 Standards-Version: 3.9.3
 Homepage: http://avalentino.github.com/pyepr
 Vcs-Git: git://git.debian.org/git/pkg-grass/pyepr.git
@@ -16,9 +21,8 @@ Package: python-epr
 Architecture: any
 Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends},
          ${sphinxdoc:Depends}, python-numpy
-X-Python-Version: ${python:Versions}
 Provides: ${python:Provides}
-Description: Python ENVISAT Product Reader API
+Description: Python ENVISAT Product Reader API (Python 2)
  PyEPR provides Python bindings for the ENVISAT Product Reader C API
  (EPR API) for reading satellite data from ENVISAT ESA (European Space
  Agency) mission.
@@ -28,6 +32,8 @@ Description: Python ENVISAT Product Reader API
  to the data either on a geophysical (decoded, ready-to-use pixel
  samples) or on a raw data layer. The raw data access makes it possible
  to read any data field contained in a product file.
+ .
+ This is the Python 2 version of the package.
 
 Package: python-epr-dbg
 Section: debug
@@ -35,10 +41,9 @@ Priority: extra
 Architecture: any
 Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends},
          ${sphinxdoc:Depends}, python-epr (= ${binary:Version})
-X-Python-Version: ${python:Versions}
 Provides: ${python:Provides}
 Recommends: python-numpy-dbg
-Description: Python ENVISAT Product Reader API (debug extension)
+Description: Python ENVISAT Product Reader API (debug extensioni for Python 2)
  PyEPR provides Python bindings for the ENVISAT Product Reader C API
  (EPR API) for reading satellite data from ENVISAT ESA (European Space
  Agency) mission.
@@ -49,4 +54,44 @@ Description: Python ENVISAT Product Reader API (debug extension)
  samples) or on a raw data layer. The raw data access makes it possible
  to read any data field contained in a product file.
  .
- This package contains the extension built for the Python debug interpreter.
+ This package contains the extension built for the Python 2 debug interpreter.
+
+Package: python3-epr
+Architecture: any
+Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends},
+         ${sphinxdoc:Depends}, python3-numpy
+Provides: ${python3:Provides}
+Description: Python ENVISAT Product Reader API (Python 3)
+ PyEPR provides Python bindings for the ENVISAT Product Reader C API
+ (EPR API) for reading satellite data from ENVISAT ESA (European Space
+ Agency) mission.
+ .
+ PyEPR, as well as the EPR API for C, supports ENVISAT MERIS, AATSR
+ Level 1B and Level 2 and also ASAR data products. It provides access
+ to the data either on a geophysical (decoded, ready-to-use pixel
+ samples) or on a raw data layer. The raw data access makes it possible
+ to read any data field contained in a product file.
+ .
+ This package contains pyepr for Python 3.
+
+Package: python3-epr-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends},
+         ${sphinxdoc:Depends}, python3-epr (= ${binary:Version})
+Provides: ${python3:Provides}
+Recommends: python-numpy-dbg
+Description: Python ENVISAT Product Reader API (debug extension for Python 3)
+ PyEPR provides Python bindings for the ENVISAT Product Reader C API
+ (EPR API) for reading satellite data from ENVISAT ESA (European Space
+ Agency) mission.
+ .
+ PyEPR, as well as the EPR API for C, supports ENVISAT MERIS, AATSR
+ Level 1B and Level 2 and also ASAR data products. It provides access
+ to the data either on a geophysical (decoded, ready-to-use pixel
+ samples) or on a raw data layer. The raw data access makes it possible
+ to read any data field contained in a product file.
+ .
+ This package contains the extension built for the Python 3 debug interpreter.
+
diff --git a/debian/rules b/debian/rules
index eab8e30..7b4382b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,37 +4,42 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-#PYVERS = $(shell pyversions -r -v)
-
+#PY2VERS=$(shell pyversions -vr)
+PY3VERS=$(shell py3versions -vr)
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 export CFLAGS ?= -O0
 endif
 
 
 %:
-	dh $@ --with python2 --buildsystem=python_distutils
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=python_distutils
+
+
+build-python%:
+	python$* setup.py build
+	python$*-dbg setup.py build
 
 
-override_dh_auto_build:
+override_dh_auto_build: $(PYTHON3:%=build-python%)
 	dh_auto_build
-ifeq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS)))
-	$(MAKE) -C doc html
-else
-	mkdir -p doc/html
-endif
 
 
 override_dh_auto_clean:
 	dh_auto_clean
 	$(RM) src/epr.c
 	$(RM) -r doc/_build doc/html
+	$(RM) -r build
+	$(RM) -r *.egg-info
 
 
 # suppress dh_auto_test since it requires a large download
 override_dh_auto_test:
 #ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 #	set -e -x;\
-#	for py in $(PYVERS); do \
+#	for py in $(PY2VERS); do \
+#		PYTHONPATH=$(CURDIR)/build/lib.*-$$py python$$py test/test_all.py ;\
+#		PYTHONPATH=$(CURDIR)/build/lib.*-$$py-pydebug python$$py-dbg test/test_all.py ;\
+#	for py in $(PY3VERS); do \
 #		PYTHONPATH=$(CURDIR)/build/lib.*-$$py python$$py test/test_all.py ;\
 #		PYTHONPATH=$(CURDIR)/build/lib.*-$$py-pydebug python$$py-dbg test/test_all.py ;\
 #	done
@@ -42,16 +47,27 @@ override_dh_auto_test:
 
 override_dh_install:
 	# Install everything excluding the *_d.so debug extensions to python-epr
-	dh_install -X"*_d.so" "debian/tmp/*" -p python-epr
+	dh_install -X"*_d.so" "debian/tmp/usr/lib/python2*" -p python-epr
+	dh_install -X"*dmu.so" "debian/tmp/usr/lib/python3*" -p python3-epr
 
 	# Install the debug extensions to python-epr-dbg
-	dh_install "debian/tmp/usr/lib/python*/*-packages/*_d.so" -p python-epr-dbg
+	dh_install "debian/tmp/usr/lib/python2*/*-packages/*_d.so" -p python-epr-dbg
+	dh_install "debian/tmp/usr/lib/python3*/*-packages/*dmu.so" -p python3-epr-dbg
 
 	# Continue with regular dh_install
 	dh_install
 	dh_numpy
 
 
+install-python%:
+	python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
+	python$*-dbg setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
+
+
+override_dh_auto_install: $(PY3VERS:%=install-python%)
+	dh_auto_install
+
+
 override_dh_installchangelogs:
 	dh_installchangelogs doc/NEWS.txt
 
@@ -60,5 +76,16 @@ override_dh_compress:
 	dh_compress -X.txt
 
 
+override_dh_installdocs:
+ifeq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS)))
+	$(MAKE) -C doc html
+else
+	mkdir -p doc/html
+endif
+	dh_installdocs
+
+
 .PHONY: override_dh_auto_build override_dh_auto_clean override_dh_auto_test \
-        override_dh_installchangelogs override_dh_compress override_dh_install
+        override_dh_installchangelogs override_dh_compress override_dh_install \
+        override_dh_auto_install override_dh_installdocs
+

-- 
Python ENVISAT Product Reader API



More information about the Pkg-grass-devel mailing list