[Python-modules-commits] r21193 - in packages/py3cairo (8 files)
vbkaisetsu-guest at users.alioth.debian.org
vbkaisetsu-guest at users.alioth.debian.org
Fri Apr 13 13:57:01 UTC 2012
Date: Friday, April 13, 2012 @ 13:57:00
Author: vbkaisetsu-guest
Revision: 21193
copy py3cairo trunk to tags and update trunk
Added:
packages/py3cairo/tags/1.10.0+dfsg-1/
packages/py3cairo/tags/1.10.0+dfsg-1/debian/changelog
(from rev 21068, packages/py3cairo/trunk/debian/changelog)
packages/py3cairo/tags/1.10.0+dfsg-1/debian/rules
(from rev 21069, packages/py3cairo/trunk/debian/rules)
Modified:
packages/py3cairo/trunk/debian/changelog
packages/py3cairo/trunk/debian/control
packages/py3cairo/trunk/debian/rules
Deleted:
packages/py3cairo/tags/1.10.0+dfsg-1/debian/changelog
packages/py3cairo/tags/1.10.0+dfsg-1/debian/rules
Deleted: packages/py3cairo/tags/1.10.0+dfsg-1/debian/changelog
===================================================================
--- packages/py3cairo/trunk/debian/changelog 2012-04-05 14:45:08 UTC (rev 21067)
+++ packages/py3cairo/tags/1.10.0+dfsg-1/debian/changelog 2012-04-13 13:57:00 UTC (rev 21193)
@@ -1,5 +0,0 @@
-py3cairo (1.10.0+dfsg-1) unstable; urgency=low
-
- * Initial release. (Closes: #662957)
-
- -- Koichi Akabe <vbkaisetsu at gmail.com> Tue, 13 Mar 2012 09:10:59 +0900
Copied: packages/py3cairo/tags/1.10.0+dfsg-1/debian/changelog (from rev 21068, packages/py3cairo/trunk/debian/changelog)
===================================================================
--- packages/py3cairo/tags/1.10.0+dfsg-1/debian/changelog (rev 0)
+++ packages/py3cairo/tags/1.10.0+dfsg-1/debian/changelog 2012-04-13 13:57:00 UTC (rev 21193)
@@ -0,0 +1,5 @@
+py3cairo (1.10.0+dfsg-1) unstable; urgency=low
+
+ * Initial release. (Closes: #662957)
+
+ -- Koichi Akabe <vbkaisetsu at gmail.com> Thu, 05 Apr 2012 23:34:52 +0900
Deleted: packages/py3cairo/tags/1.10.0+dfsg-1/debian/rules
===================================================================
--- packages/py3cairo/trunk/debian/rules 2012-04-05 14:45:08 UTC (rev 21067)
+++ packages/py3cairo/tags/1.10.0+dfsg-1/debian/rules 2012-04-13 13:57:00 UTC (rev 21193)
@@ -1,39 +0,0 @@
-#!/usr/bin/make -f
-
-%:
- dh "$@" --with sphinxdoc --with python3
-
-upstream_version ?= $(shell dpkg-parsechangelog | sed -rne 's/^Version: ([0-9.]+)(\+dfsg)?.*$$/\1/p')
-dfsg_version = $(upstream_version)+dfsg
-upstream_pkg = "pycairo"
-pkg = $(shell dpkg-parsechangelog | sed -ne 's/^Source: //p')
-
-get-orig-source:
- uscan --rename --download-current-version --destdir=.
- tar -xjf $(pkg)_$(upstream_version).orig.tar.bz2
- rm -f $(pkg)_$(upstream_version).orig.tar.bz2
- mv $(upstream_pkg)-$(upstream_version) $(pkg)_$(dfsg_version).orig
- $(CURDIR)/debian/waf-uncompress.sh $(pkg)_$(dfsg_version).orig
- rm $(pkg)_$(dfsg_version).orig/waf
- rm -r $(pkg)_$(dfsg_version).orig/doc/_build
- tar -cjf $(CURDIR)/../$(pkg)_$(dfsg_version).orig.tar.bz2 $(pkg)_$(dfsg_version).orig
- 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 -o build$$pyversion --prefix /usr --nopyc --nopyo; done
-
-override_dh_auto_build:
- for pyversion in $(shell py3versions -vr); do PYTHON=python$$pyversion python$$pyversion $(CURDIR)/waf-uncompressed build -o 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 -o 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 build-dbg .waf* .lock* doc/_build `find . -name "__pycache__"` `find waflib -name "*.pyc"`
-
-override_dh_compress:
- dh_compress -X.js -X.inv
Copied: packages/py3cairo/tags/1.10.0+dfsg-1/debian/rules (from rev 21069, packages/py3cairo/trunk/debian/rules)
===================================================================
--- packages/py3cairo/tags/1.10.0+dfsg-1/debian/rules (rev 0)
+++ packages/py3cairo/tags/1.10.0+dfsg-1/debian/rules 2012-04-13 13:57:00 UTC (rev 21193)
@@ -0,0 +1,42 @@
+#!/usr/bin/make -f
+
+%:
+ dh "$@" --with sphinxdoc --with python3
+
+upstream_version ?= $(shell dpkg-parsechangelog | sed -rne 's/^Version: ([0-9.]+)(\+dfsg)?.*$$/\1/p')
+dfsg_version = $(upstream_version)+dfsg
+upstream_pkg = "pycairo"
+pkg = $(shell dpkg-parsechangelog | sed -ne 's/^Source: //p')
+
+get-orig-source:
+ uscan --rename --download-current-version --destdir=.
+ tar -xjf $(pkg)_$(upstream_version).orig.tar.bz2
+ rm -f $(pkg)_$(upstream_version).orig.tar.bz2
+ mv $(upstream_pkg)-$(upstream_version) $(pkg)_$(dfsg_version).orig
+ $(CURDIR)/debian/waf-uncompress.sh $(pkg)_$(dfsg_version).orig
+ rm $(pkg)_$(dfsg_version).orig/waf
+ rm -r $(pkg)_$(dfsg_version).orig/doc/_build
+ tar -cjf $(CURDIR)/../$(pkg)_$(dfsg_version).orig.tar.bz2 $(pkg)_$(dfsg_version).orig
+ 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 -o build$$pyversion --prefix /usr --nopyc --nopyo; done
+
+override_dh_auto_build:
+ for pyversion in $(shell py3versions -vr); do PYTHON=python$$pyversion python$$pyversion $(CURDIR)/waf-uncompressed build -o 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 -o 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 build-dbg .waf* .lock* doc/_build `find . -name "__pycache__"` `find waflib -name "*.pyc"`
+
+override_dh_compress:
+ dh_compress -X.js -X.inv
+
+override_dh_sphinxdoc:
+ (test -d $(CURDIR)/debian/python3-cairo-doc && dh_sphinxdoc) || /bin/true
Modified: packages/py3cairo/trunk/debian/changelog
===================================================================
--- packages/py3cairo/trunk/debian/changelog 2012-04-12 21:01:23 UTC (rev 21192)
+++ packages/py3cairo/trunk/debian/changelog 2012-04-13 13:57:00 UTC (rev 21193)
@@ -1,3 +1,14 @@
+py3cairo (1.10.0+dfsg-2) unstable; urgency=low
+
+ * debian/rules
+ - use py.test-3 to run test suite.
+ * debian/patches/10_test-target-py3.patch
+ - add to change py.test script to use all versions of Python 3
+ * debian/control
+ - add build-depends: python3-pytest
+
+ -- Koichi Akabe <vbkaisetsu at gmail.com> Thu, 12 Apr 2012 19:00:59 +0900
+
py3cairo (1.10.0+dfsg-1) unstable; urgency=low
* Initial release. (Closes: #662957)
Modified: packages/py3cairo/trunk/debian/control
===================================================================
--- packages/py3cairo/trunk/debian/control 2012-04-12 21:01:23 UTC (rev 21192)
+++ packages/py3cairo/trunk/debian/control 2012-04-13 13:57:00 UTC (rev 21193)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Koichi Akabe <vbkaisetsu at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), python3-all-dev (>= 3.1), libcairo2-dev (>= 1.10.0), python-sphinx (>= 1.0.7+dfsg) | python3-sphinx
+Build-Depends: debhelper (>= 7.0.50~), 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
Homepage: http://cairographics.org/pycairo/
X-Python3-Version: >= 3.1
Modified: packages/py3cairo/trunk/debian/rules
===================================================================
--- packages/py3cairo/trunk/debian/rules 2012-04-12 21:01:23 UTC (rev 21192)
+++ packages/py3cairo/trunk/debian/rules 2012-04-13 13:57:00 UTC (rev 21193)
@@ -33,10 +33,15 @@
override_dh_clean:
dh_clean
for pyversion in $(shell py3versions -vr); do rm -rf build$$pyversion; done
- rm -rf build-dbg .waf* .lock* doc/_build `find . -name "__pycache__"` `find waflib -name "*.pyc"`
+ 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"`
override_dh_compress:
dh_compress -X.js -X.inv
override_dh_sphinxdoc:
(test -d $(CURDIR)/debian/python3-cairo-doc && dh_sphinxdoc) || /bin/true
+
+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 && py.test-3; done
More information about the Python-modules-commits
mailing list