[Python-modules-commits] r34397 - in packages/py3cairo/trunk/debian (6 files)

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Sun Sep 27 22:59:53 UTC 2015 

    Date: Sunday, September 27, 2015 @ 22:59:49
  Author: kitterman
Revision: 34397

Add missing py3cairo (1.10.0+dfsg-4) to svn.

Added:
  packages/py3cairo/trunk/debian/patches/50_specify-encoding-in-waf.patch
  packages/py3cairo/trunk/debian/patches/60_python-config-without-interpreter.patch
  packages/py3cairo/trunk/debian/patches/70_dont-link-libpython.patch
Modified:
  packages/py3cairo/trunk/debian/changelog
  packages/py3cairo/trunk/debian/control
  packages/py3cairo/trunk/debian/patches/series

Modified: packages/py3cairo/trunk/debian/changelog
===================================================================
--- packages/py3cairo/trunk/debian/changelog	2015-09-27 19:56:58 UTC (rev 34396)
+++ packages/py3cairo/trunk/debian/changelog	2015-09-27 22:59:49 UTC (rev 34397)
@@ -1,10 +1,12 @@
-py3cairo (1.10.0+dfsg-4~exp1) experimental; urgency=medium
+py3cairo (1.10.0+dfsg-4) unstable; urgency=medium
 
-  * Rebuild for Python 3.4 (LP: 1264729)
+  * debian/patches/70_dont-link-libpython.patch
+   - remove dependency to libpython (Closes: #734358, #739607)
   * debian/control
-   - force python3-all-dev version (>= 3.3.3) to build with Python 3.4
+   - bump Standards-Version to 3.9.5
+   - remove python-sphinx from build-deps and keep python3-sphinx
 
- -- Koichi Akabe <vbkaisetsu at gmail.com>  Sun, 29 Dec 2013 08:13:52 +0900
+ -- Koichi Akabe <vbkaisetsu at gmail.com>  Thu, 20 Feb 2014 22:10:33 +0900
 
 py3cairo (1.10.0+dfsg-3) unstable; urgency=low
 

Modified: packages/py3cairo/trunk/debian/control
===================================================================
--- packages/py3cairo/trunk/debian/control	2015-09-27 19:56:58 UTC (rev 34396)
+++ packages/py3cairo/trunk/debian/control	2015-09-27 22:59:49 UTC (rev 34397)
@@ -3,12 +3,12 @@
 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 (>= 9.0.0), python3-all-dev (>= 3.3.3), libcairo2-dev (>= 1.10.0), python-sphinx (>= 1.0.7+dfsg) | python3-sphinx, python3-pytest
+Build-Depends: debhelper (>= 9.0.0), python3-all-dev (>= 3.1), libcairo2-dev (>= 1.10.0), python3-sphinx, python3-pytest
 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/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/py3cairo/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/py3cairo/trunk/
 
 Package: python3-cairo
 Architecture: any

Added: packages/py3cairo/trunk/debian/patches/50_specify-encoding-in-waf.patch
===================================================================
--- packages/py3cairo/trunk/debian/patches/50_specify-encoding-in-waf.patch	                        (rev 0)
+++ packages/py3cairo/trunk/debian/patches/50_specify-encoding-in-waf.patch	2015-09-27 22:59:49 UTC (rev 34397)
@@ -0,0 +1,32 @@
+Description: specify encoding in waf
+ This patch specifies utf-8 as the encoding in waf library, because python 3.3
+ doesn't fallback to utf-8 on default.
+Author: Matthias Klose <doko at ubuntu.com>
+Origin: http://launchpadlibrarian.net/120606963/py3cairo_1.10.0%2Bdfsg-3~exp2_1.10.0%2Bdfsg-3~exp2ubuntu1.diff.gz
+Bug-Debian: http://bugs.debian.org/691241
+Last-Update: 2012-10-28
+
+--- py3cairo-1.10.0+dfsg.orig/waflib/Utils.py
++++ py3cairo-1.10.0+dfsg/waflib/Utils.py
+@@ -77,8 +77,8 @@ except ImportError:
+ 				return value
+ is_win32=sys.platform=='win32'
+ indicator=is_win32 and'\x1b[A\x1b[K%s%s%s\r'or'\x1b[K%s%s%s\r'
+-def readf(fname,m='r'):
+-	f=open(fname,m)
++def readf(fname,m='r',enc=None):
++	f=open(fname,m,encoding=enc)
+ 	try:
+ 		txt=f.read()
+ 	finally:
+--- py3cairo-1.10.0+dfsg.orig/waflib/Tools/c_preproc.py
++++ py3cairo-1.10.0+dfsg/waflib/Tools/c_preproc.py
+@@ -44,7 +44,7 @@ def repl(m):
+ 		return' '
+ 	return m.group(3)or''
+ def filter_comments(filename):
+-	code=Utils.readf(filename)
++	code=Utils.readf(filename, enc='utf-8')
+ 	if use_trigraphs:
+ 		for(a,b)in trig_def:code=code.split(a).join(b)
+ 	code=re_nl.sub('',code)

Added: packages/py3cairo/trunk/debian/patches/60_python-config-without-interpreter.patch
===================================================================
--- packages/py3cairo/trunk/debian/patches/60_python-config-without-interpreter.patch	                        (rev 0)
+++ packages/py3cairo/trunk/debian/patches/60_python-config-without-interpreter.patch	2015-09-27 22:59:49 UTC (rev 34397)
@@ -0,0 +1,17 @@
+Description: run python-config directly
+ This patch runs /usr/bin/python-config directly for python 3.3
+Author: Sebastien Bacher <seb128 at ubuntu.com>
+Origin: http://launchpadlibrarian.net/125114732/py3cairo_1.10.0%2Bdfsg-3~exp3_1.10.0%2Bdfsg-3~exp3ubuntu1.diff.gz
+Last-Update: 2013-03-30
+
+--- py3cairo-1.10.0+dfsg.orig/waflib/Tools/python.py
++++ py3cairo-1.10.0+dfsg/waflib/Tools/python.py
+@@ -169,7 +169,7 @@ def check_python_headers(conf):
+ 		conf.find_program('python-config-%s'%num,var='PYTHON_CONFIG',mandatory=False)
+ 	includes=[]
+ 	if conf.env.PYTHON_CONFIG:
+-		for incstr in conf.cmd_and_log(conf.env.PYTHON+[conf.env.PYTHON_CONFIG,'--includes']).strip().split():
++		for incstr in conf.cmd_and_log([conf.env.PYTHON_CONFIG,'--includes']).strip().split():
+ 			if(incstr.startswith('-I')or incstr.startswith('/I')):
+ 				incstr=incstr[2:]
+ 			if incstr not in includes:

Added: packages/py3cairo/trunk/debian/patches/70_dont-link-libpython.patch
===================================================================
--- packages/py3cairo/trunk/debian/patches/70_dont-link-libpython.patch	                        (rev 0)
+++ packages/py3cairo/trunk/debian/patches/70_dont-link-libpython.patch	2015-09-27 22:59:49 UTC (rev 34397)
@@ -0,0 +1,29 @@
+Description: don't link libpython
+ This patch removes dependency to libpython 
+Author: Matthias Klose <doko at ubuntu.com>
+Origin: http://launchpadlibrarian.net/166876566/py3cairo_1.10.0%2Bdfsg-3build2_1.10.0%2Bdfsg-3ubuntu1.diff.gz
+Bug-Debian: http://bugs.debian.org/739607
+Last-Update: 2014-02-20
+
+--- py3cairo-1.10.0+dfsg.orig/waflib/Tools/python.py
++++ py3cairo-1.10.0+dfsg/waflib/Tools/python.py
+@@ -155,8 +155,10 @@ def check_python_headers(conf):
+ 		if result:
+ 			break
+ 	if result:
+-		env['LIBPATH_PYEMBED']=path
+-		env.append_value('LIB_PYEMBED',[name])
++		# don't link libpython explicitly
++		#env['LIBPATH_PYEMBED']=path
++		#env.append_value('LIB_PYEMBED',[name])
++		pass
+ 	else:
+ 		conf.to_log("\n\n### LIB NOT FOUND\n")
+ 	if(sys.platform=='win32'or sys.platform.startswith('os2')or sys.platform=='darwin'or dct['Py_ENABLE_SHARED']):
+@@ -278,4 +280,4 @@ feature('pyembed')(init_pyembed)
+ conf(get_python_variables)
+ conf(check_python_headers)
+ conf(check_python_version)
+-conf(check_python_module)
+\ No newline at end of file
++conf(check_python_module)

Modified: packages/py3cairo/trunk/debian/patches/series
===================================================================
--- packages/py3cairo/trunk/debian/patches/series	2015-09-27 19:56:58 UTC (rev 34396)
+++ packages/py3cairo/trunk/debian/patches/series	2015-09-27 22:59:49 UTC (rev 34397)
@@ -2,3 +2,4 @@
 50_specify-encoding-in-waf.patch
 101_pycairo-region.patch
 60_python-config-without-interpreter.patch
+70_dont-link-libpython.patch

More information about the Python-modules-commits mailing list