[Python-modules-commits] r26912 - in packages/py3cairo/trunk/debian (4 files)

vbkaisetsu-guest at users.alioth.debian.org vbkaisetsu-guest at users.alioth.debian.org
Sat Dec 28 23:35:12 UTC 2013 

    Date: Saturday, December 28, 2013 @ 23:35:11
  Author: vbkaisetsu-guest
Revision: 26912

Import py3cairo 1.10.0+dfsg-4 changes

Modified:
  packages/py3cairo/trunk/debian/changelog
  packages/py3cairo/trunk/debian/control
  packages/py3cairo/trunk/debian/patches/series
  packages/py3cairo/trunk/debian/rules

Modified: packages/py3cairo/trunk/debian/changelog
===================================================================
--- packages/py3cairo/trunk/debian/changelog	2013-12-28 22:11:04 UTC (rev 26911)
+++ packages/py3cairo/trunk/debian/changelog	2013-12-28 23:35:11 UTC (rev 26912)
@@ -1,11 +1,35 @@
-py3cairo (1.10.0+dfsg-3~exp3) UNRELEASED; urgency=low
+py3cairo (1.10.0+dfsg-4) unstable; urgency=medium
 
-  * Use canonical URIs for Vcs-* fields.
-  * Remove DM-Upload-Allowed; it's no longer used by the archive
-    software.
+  * Rebuild for Python 3.4 (LP: 1264729)
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 18:40:49 +0200
+ -- Koichi Akabe <vbkaisetsu at gmail.com>  Sun, 29 Dec 2013 08:13:52 +0900
 
+py3cairo (1.10.0+dfsg-3) unstable; urgency=low
+
+  * Upload to unstable (Closes: #707145)
+
+ -- Koichi Akabe <vbkaisetsu at gmail.com>  Wed, 15 May 2013 09:58:53 +0900
+
+py3cairo (1.10.0+dfsg-3~exp4) experimental; urgency=low
+
+  * rebuild for Python 3.3 (Closes: #703676)
+  * debian/patches/60_python-config-without-interpreter.patch
+   - fix waflib to support python 3.3
+  * debian/control
+   - update Standards-Version to 3.9.4
+   - remove obsolete DMUA
+
+ -- Koichi Akabe <vbkaisetsu at gmail.com>  Sat, 30 Mar 2013 17:58:39 +0900
+
+py3cairo (1.10.0+dfsg-3~exp3) experimental; urgency=low
+
+  * debian/rules
+   - fix build for other python3 versions (Closes: #691241)
+  * debian/patches/50_specify-encoding-in-waf.patch
+   - add to fix encoding probrem on python 3.3
+
+ -- Koichi Akabe <vbkaisetsu at gmail.com>  Sun, 28 Oct 2012 20:00:11 +0900
+
 py3cairo (1.10.0+dfsg-3~exp2) experimental; urgency=low
 
   * debian/patches/101_pycairo-region.patch

Modified: packages/py3cairo/trunk/debian/control
===================================================================
--- packages/py3cairo/trunk/debian/control	2013-12-28 22:11:04 UTC (rev 26911)
+++ packages/py3cairo/trunk/debian/control	2013-12-28 23:35:11 UTC (rev 26912)
@@ -4,7 +4,7 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Koichi Akabe <vbkaisetsu at gmail.com>
 Build-Depends: debhelper (>= 9.0.0), python3-all-dev (>= 3.1), libcairo2-dev (>= 1.10.0), python-sphinx (>= 1.0.7+dfsg) | python3-sphinx, python3-pytest
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Homepage: http://cairographics.org/pycairo/
 X-Python3-Version: >= 3.1
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/py3cairo/trunk/

Modified: packages/py3cairo/trunk/debian/patches/series
===================================================================
--- packages/py3cairo/trunk/debian/patches/series	2013-12-28 22:11:04 UTC (rev 26911)
+++ packages/py3cairo/trunk/debian/patches/series	2013-12-28 23:35:11 UTC (rev 26912)
@@ -1,2 +1,4 @@
 10_test-target-py3.patch
+50_specify-encoding-in-waf.patch
 101_pycairo-region.patch
+60_python-config-without-interpreter.patch

Modified: packages/py3cairo/trunk/debian/rules
===================================================================
--- packages/py3cairo/trunk/debian/rules	2013-12-28 22:11:04 UTC (rev 26911)
+++ packages/py3cairo/trunk/debian/rules	2013-12-28 23:35:11 UTC (rev 26912)
@@ -20,20 +20,34 @@
 	rm -r $(pkg)_$(dfsg_version).orig
 
 override_dh_auto_configure:
-	for pyversion in $(shell py3versions -vr); do PYTHON=python$$pyversion python$$pyversion $(CURDIR)/waf-uncompressed configure -v -o build$$pyversion --prefix /usr --nopyc --nopyo; done
+	: # configure done in the build target to build for multiple python versions
 
 override_dh_auto_build:
-	for pyversion in $(shell py3versions -vr); do PYTHON=python$$pyversion python$$pyversion $(CURDIR)/waf-uncompressed build -v -o build$$pyversion; done
+	set -x; \
+	for pyversion in $(shell py3versions -vr); do \
+		echo "configuring for $$pyversion"; \
+		PYTHON=python$$pyversion python$$pyversion $(CURDIR)/waf-uncompressed configure -v -o $(CURDIR)/build$$pyversion --prefix /usr --nopyc --nopyo; \
+		echo "building for $$pyversion"; \
+		PYTHON=python$$pyversion python$$pyversion $(CURDIR)/waf-uncompressed build -v -o $(CURDIR)/build$$pyversion; \
+	done
 	mkdir -p $(CURDIR)/doc/_build/html
 	cd $(CURDIR)/doc && $(MAKE) html
 
 override_dh_auto_install:
-	for pyversion in $(shell py3versions -vr); do PYTHON=python$$pyversion python$$pyversion $(CURDIR)/waf-uncompressed install -v -o build$$pyversion --destdir $(CURDIR)/debian/tmp; done
+	for pyversion in $(shell py3versions -vr); do \
+		cp -p $(CURDIR)/build$$pyversion/.lock-wafbuild .; \
+		PYTHON=python$$pyversion python$$pyversion $(CURDIR)/waf-uncompressed install -v -o $(CURDIR)/build$$pyversion --destdir $(CURDIR)/debian/tmp; \
+	done
 
 override_dh_clean:
 	dh_clean
-	for pyversion in $(shell py3versions -vr); do rm -rf build$$pyversion; done
-	rm -rf .waf* .lock* doc/_build test/cairo `find . -name "__pycache__"` `find waflib -name "*.pyc"` `find examples -name "*.pdf" -o -name "*.png" -o -name "*.ps" -o -name "*.svg"`
+	for pyversion in $(shell py3versions -vr); \
+		do rm -rf $(CURDIR)/build$$pyversion; \
+	done
+	rm -rf $(CURDIR)/.waf* $(CURDIR)/.lock* $(CURDIR)/doc/_build $(CURDIR)/test/cairo \
+		`find $(CURDIR) -name "__pycache__"` \
+		`find $(CURDIR)/waflib -name "*.pyc"` \
+		`find $(CURDIR)/examples -name "*.pdf" -o -name "*.png" -o -name "*.ps" -o -name "*.svg"`
 
 override_dh_compress:
 	dh_compress -X.js -X.inv
@@ -45,5 +59,8 @@
 override_dh_auto_test:
 	mkdir $(CURDIR)/test/cairo
 	ln -s $(CURDIR)/src/__init__.py $(CURDIR)/test/cairo/__init__.py
-	for pyversion in $(shell py3versions -vr); do ln -sf $(CURDIR)/build$$pyversion/src/*.so $(CURDIR)/test/cairo; cd $(CURDIR)/test && python$$pyversion -m pytest; done
+	for pyversion in $(shell py3versions -vr); \
+		do ln -sf $(CURDIR)/build$$pyversion/src/*.so $(CURDIR)/test/cairo; \
+		cd $(CURDIR)/test && python$$pyversion -m pytest; \
+	done
 endif

More information about the Python-modules-commits mailing list