[Python-modules-commits] r27704 - in packages/pycurl/trunk/debian (changelog control rules)

Sun Feb 16 15:49:43 UTC 2014

Date: Sunday, February 16, 2014 @ 15:49:42
  Author: morph
Revision: 27704

Build Python 3 packages

Modified:
  packages/pycurl/trunk/debian/changelog
  packages/pycurl/trunk/debian/control
  packages/pycurl/trunk/debian/rules

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

--- packages/pycurl/trunk/debian/changelog	2014-02-16 13:38:51 UTC (rev 27703)
+++ packages/pycurl/trunk/debian/changelog	2014-02-16 15:49:42 UTC (rev 27704)
@@ -15,8 +15,9 @@
   * Build and install doc from ReST files
   * debian/rules
     - use dh_installdocs to link doc dirs to main package
+  * Build Python 3 packages
 
- -- Sandro Tosi <morph at debian.org>  Sat, 15 Feb 2014 19:18:05 +0100
+ -- Sandro Tosi <morph at debian.org>  Sun, 16 Feb 2014 16:49:22 +0100
 
 pycurl (7.19.3-1) unstable; urgency=medium
 

Modified: packages/pycurl/trunk/debian/control
===================================================================
--- packages/pycurl/trunk/debian/control	2014-02-16 13:38:51 UTC (rev 27703)
+++ packages/pycurl/trunk/debian/control	2014-02-16 15:49:42 UTC (rev 27704)
@@ -3,9 +3,10 @@
 Priority: optional
 Maintainer: Sandro Tosi <morph at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50~), python-all-dev (>= 2.6.6-3~), python-all-dbg, libcurl4-gnutls-dev (>= 7.19.0), librtmp-dev, libssh2-1-dev, python-nose, python-bottle, python-cherrypy3, python-docutils
+Build-Depends: debhelper (>= 7.0.50~), python-all-dev (>= 2.6.6-3~), python-all-dbg, python3-all-dev, python3-all-dbg, dh-python, libcurl4-gnutls-dev (>= 7.19.0), librtmp-dev, libssh2-1-dev, python-nose, python-bottle, python-cherrypy3, python-docutils
 Standards-Version: 3.9.5
 X-Python-Version: all
+X-Python3-Version: >= 3.3
 Homepage: http://pycurl.sourceforge.net
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/pycurl/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/pycurl/trunk/
@@ -14,11 +15,23 @@
 Architecture: any
 Suggests: libcurl4-gnutls-dev, python-pycurl-dbg
 Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
+Description: Python bindings to libcurl (Python 3)
+ This module provides the Python bindings to libcurl. Please refer to
+ the libcurl documentation available in libcurl4-gnutls-dev Debian package.
+ .
+ NOTE: the SSL support is provided by GnuTLS.
+
+Package: python3-pycurl
+Architecture: any
+Suggests: libcurl4-gnutls-dev, python3-pycurl-dbg
+Depends: ${shlibs:Depends}, ${python3:Depends}, ${misc:Depends}
 Description: Python bindings to libcurl
  This module provides the Python bindings to libcurl. Please refer to
  the libcurl documentation available in libcurl4-gnutls-dev Debian package.
  .
  NOTE: the SSL support is provided by GnuTLS.
+ .
+ This package contains PyCURL for Python 3.
 
 Package: python-pycurl-dbg
 Section: debug
@@ -30,3 +43,14 @@
  the libcurl documentation available in libcurl4-gnutls-dev Debian package.
  .
  This package contains the extension built for the Python debug interpreter.
+
+Package: python3-pycurl-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}, python3-dbg, python3-pycurl (= ${binary:Version}), ${misc:Depends}
+Description: Python bindings to libcurl (debug extension, Python 3)
+ This module provides the Python bindings to libcurl. Please refer to
+ the libcurl documentation available in libcurl4-gnutls-dev Debian package.
+ .
+ This package contains the extension built for the Python 3 debug interpreter.

Modified: packages/pycurl/trunk/debian/rules
===================================================================
--- packages/pycurl/trunk/debian/rules	2014-02-16 13:38:51 UTC (rev 27703)
+++ packages/pycurl/trunk/debian/rules	2014-02-16 15:49:42 UTC (rev 27704)
@@ -6,18 +6,19 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-PYVERS := $(shell pyversions -vs)
+PY2VERS := $(shell pyversions -vs)
+PY3VERS := $(shell py3versions -vs)
 CURLVERS := $(strip $(shell /usr/bin/curl-config --version | awk '{print $$2}'))
 
 unexport LDFLAGS
 export FFLAGS="-fPIC"
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2,python3
 
 override_dh_auto_build:
 	set -e ;\
-	for py in $(PYVERS) ; do \
+	for py in $(PY2VERS) $(PY3VERS) ; do \
 		python$$py setup.py build ; \
 		python$$py-dbg setup.py build ; \
 	done
@@ -27,22 +28,26 @@
 override_dh_auto_test:
 ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 	-set -e ;\
-	for py in $(PYVERS) ; do \
+	for py in $(PY2VERS) $(PY3VERS) ; do \
 		PYTHONPATH=`ls -d $(CURDIR)/build/lib.*-*-$$py` nosetests --verbose ; \
 	done
 endif
 
 override_dh_auto_install:
-	for py in $(PYVERS); do \
+	for py in $(PY2VERS); do \
   	    python$$py setup.py install --root=$(CURDIR)/debian/python-pycurl --install-layout=deb; \
  	    python$$py-dbg setup.py install --root=$(CURDIR)/debian/python-pycurl-dbg --install-layout=deb; \
 	done
+	for py in $(PY3VERS); do \
+  	    python$$py setup.py install --root=$(CURDIR)/debian/python3-pycurl --install-layout=deb; \
+ 	    python$$py-dbg setup.py install --root=$(CURDIR)/debian/python3-pycurl-dbg --install-layout=deb; \
+	done
 
 	# Remove documentation as installed by setup.py
-	rm -rf $(CURDIR)/debian/python-pycurl*/usr/share/doc/pycurl
+	rm -rf $(CURDIR)/debian/python*-pycurl*/usr/share/doc/pycurl
 
-	rm -rf $(CURDIR)/debian/python-pycurl-dbg/usr/lib/python*/*-packages/curl
-	rm -f $(CURDIR)/debian/python-pycurl-dbg/usr/lib/python*/*-packages/pycurl-*.egg-info
+	rm -rf $(CURDIR)/debian/python*-pycurl-dbg/usr/lib/python*/*-packages/curl
+	rm -f $(CURDIR)/debian/python*-pycurl-dbg/usr/lib/python*/*-packages/pycurl-*.egg-info
 
 override_dh_installdocs:
 	cp -a build/www/htdocs/doc/*.html $(CURDIR)/debian/python-pycurl/usr/share/doc/python-pycurl/html
@@ -57,6 +62,7 @@
 override_dh_strip:
 ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
 	dh_strip -ppython-pycurl --dbg-package=python-pycurl-dbg
+	dh_strip -ppython3-pycurl --dbg-package=python3-pycurl-dbg
 endif
 
 override_dh_compress:


