[Python-modules-commits] r30720 - in packages/cairocffi/trunk/debian (13 files)

jcjaskula-guest at users.alioth.debian.org jcjaskula-guest at users.alioth.debian.org
Mon Sep 22 21:37:46 UTC 2014 

    Date: Monday, September 22, 2014 @ 21:37:45
  Author: jcjaskula-guest
Revision: 30720

First cleaning round

Added:
  packages/cairocffi/trunk/debian/cairographics.org_pycairo2_objects.inv
  packages/cairocffi/trunk/debian/patches/
  packages/cairocffi/trunk/debian/patches/fix_import_sphinxdoc.patch
  packages/cairocffi/trunk/debian/patches/series
  packages/cairocffi/trunk/debian/patches/use_local_objects.inv.patch
  packages/cairocffi/trunk/debian/python-cairocffi-doc.doc-base
  packages/cairocffi/trunk/debian/python.org_objects.inv
  packages/cairocffi/trunk/debian/source/include-binaries
Modified:
  packages/cairocffi/trunk/debian/control
  packages/cairocffi/trunk/debian/copyright
  packages/cairocffi/trunk/debian/python-cairocffi-doc.docs
  packages/cairocffi/trunk/debian/rules
Deleted:
  packages/cairocffi/trunk/debian/patches/

Added: packages/cairocffi/trunk/debian/cairographics.org_pycairo2_objects.inv
===================================================================
--- packages/cairocffi/trunk/debian/cairographics.org_pycairo2_objects.inv	                        (rev 0)
+++ packages/cairocffi/trunk/debian/cairographics.org_pycairo2_objects.inv	2014-09-22 21:37:45 UTC (rev 30720)
@@ -0,0 +1,29 @@
+# Sphinx inventory version 2
+# Project: Pycairo
+# Version: 1.10
+# The remainder of this file is compressed using zlib.
+xÚ­\_“¢H÷Sqûªw3s»q1o¨èpA«+ÚÓ{/4T+7(àt÷}ú˪¢  Íd^ºAÉ¢*+ÿþ2Ë 9å…*rvðóa^„_cÿ™ÇÃѧaÆ_xÆOÿ{ Šcü·êv$h?Ê’ñ7Ë“0:…ü­9Lú>Ò_(òáCžc>tÄGƒ‚¿×Þ+¾S4¿
+·p=êÙF§‚y‘EaÚ@<ÒÄåüå–=Øۍ3õŒ×ÀŸÈ#kjJõk¹u,×±ÌÑ_XDÃ5zxA:R¤jüù
+à¹ðšA~Î^ü€_³þ^³Ö+ï©_®RÉ/5ÉZÜ+‰£gÿM¢z!‚r$)Õ:\gi³¯œåàèý]P}«çó ïLÖFqÌ2!fhÎåHR–Œu\—mv®mŒžŸŸÓèÇ,ÉBž¡_¡ÉGŠ\½ÇÛMÖΓí²ÕffošK)/)ɪElaÐ=?]ÐPýi©žJ/[{ø)mk¡±³Skm-d
+=¬$RC®­í·ŸF£èÄç°-òé»|Œž©I2ôö|Xøp­N‡ÖÚ1f–¤<ó‹ÏöŠPÍpµ¶7Öveî'\œ òšN
+<}·AÙ[Öä•GûÑœ”´†=ùn;‹oÍwd x„á%™yó`ƒÞ9ÚoÚoÌϧ ˆàË¡
+‡SýÔ ¢dd¼ÖõêÑ¢ØèûAÎý,h‰¦ú¬TO=°ö÷Ü`ø(s²§$S챟`_gmW—ï[&"5Üœ·ý¬¨؇S—½—ß&_Þ¤¾u	é·§J½Ô‡þðTmÞòú	=‚]}bZ°Kü'£­Ø%IXZ¹ö£íJC ›gÉq-­Ì×—R؆W¬ÉHzóp.tP×·¨A”'V#¨kyÉe¶°·21˹~­¾Á°R[TQÞ£¦àÁæ~qFÑ)ç/߬.)<Ôå5†¼Ô
+-2âú.råuÒ÷¯GeÔþ14ì’úlT=7VCüäYƒ‚-È¢Ó^ïé°›zïq¡…
+hƒØØj:ÅÔq.DZN™‡$^Æ4¡!ã=/ÚaÓå¡Lã¡*7fœÃ u`}™¾eªÅ«Å~öƒ…QV¼³ŒÀ§ýÕE]ãG{Y\„¶(é»Ë€µ,=x#áƁ‹þ‰ â¢@´]€¦­½[®–¶ ý¿O
+«e’W ÷œ¶à.i¼AºßÓƒòÕEN"MR¶Ï’sŠ#7ç¹"´"²NèRrÎÀdgûg7Szó_¥”2GxBð™¸Éȼ„Í-ÉŠÚ–µY,Ã2"ÔY¯#HÒwÄQZXW^ ·ØòØÂu¶ÿaÞn3·¦HíÐIÛ¬vËM<Òs~ HçÚÓ,
+ó Ҕ㱴fÞ²­7¬´´‰~?ûd<Oâ³ôsÈɨ‰Yîú›…ã¥JR˜õ/º†J›®½-N€ž¦šøˆ„˜Mw›G›mWô©W)?É8F!ÈM–âÐ4ã?!íAoK—|ÛŸ^V •°Ï4ÖýüËëÏ:ŠJ€ƒD~â¯=¨ãB?'Rˉ—t°ã4I7'-w;)Ô*T–iø
+©o³¹i²òèœh0Å:
+?ƒT£-FàiN|¿âó=:}ù¼Ç[€ï%%BÖ^?9€ï¯‰éd$!Ã+Ü@:‰N/	]˜…‚ó=Ÿ
+¢ž³Ÿ–€5»Ü1=˜`—¶?¥à±9Ì7çÉ I~4ÈÊžVÜ´Ë-Õùp‘ù§<ö\N¬µUF›éÏÉçe&]b-Ä¿ÐL3ðJÏÄFÒÔf‰„M¢Þàý~²wÂ.C,¬–š¦>ä?#H “——œ#£twúdâN—ü">ÁŠ£gs¢]iáMžÙÞ–­íͯȔ‘žµòí8kÔ’Ò™=·v.2½­ÖÖHöWºŽwÂ;O$ãà
+zf=æ.l„´f‡…yÕu6œÄ–N!:K)P¡N™cvL¾»¬eY"ᛪ‚2쮫\ƒ3o™÷{@%£f…”Ä$ª2*ÑÅDÔð)'%Au÷)zR5?¶±×¶…”ÜÚR/6Ö_4½’GòGf×[Íç4¥»…ߊId &JÌ´?ø9ƒ ž…Ô;ANYõ‘RÛ\CÓ
+Ùq¶°•S$R¥ûSØwg9s–‹ytÕ4ÓÃöâ=–.BŒý0ë'˜HÆ:°í«•	ž¹Î¤_.YG
+dxÿÁž9»Òë/»í;ÌÖ1ž€"Ú&ˆ´­`x §‘ƒÓ’¿¦%YâgfŽã 㐓±—,9²T$7	†%/²ä'æ*F¾Õ#T·–•ÃîÆ~†D¨X‡/Ÿ{wå"Š„aY‰Ç±RÖ{«Õ¬GˆI3S&Ä1Y¹ä	Ä< ƒûz7_âsNΉðéábV×ùsg“ª!›Åäó?{¨¦‚·
+Ÿèçž#
+SY š®\,2ÔÎbCˆž±;F¬®4t6ïïŠ$† ­£U&,KŠàºfC/ç4fPTv·áù6yםHªuD¶:#J9årê>SÙkTnd‡ÝE-ПO°ßÿøYdðH	}’íåÃ^3ˆ,„åOÑÅõV]Nvmàs"	Mªkn$9ïQ$«5‚Ör±§fÇ.$h~VÅÊû²Lëg*iÉ‘òýÁ0S`ºªâ+›Ò V¢ñ´Z¬ÕñQ¿ã°øº‰Dp ,äd¿ŒEêڝngm6± Uˆ©T‡'ú´øi
+æ’ "ªùÀ]y6—t,‚VºÔÐ]¾8J-Èˆž>ar˜Q(ÂÄÝuB8ß¹.öV»
+6¸Èá{KV˜î¼<W‚Ä8*Â~´—l5›õoï舾ïj·$54SCzõ¦sÓCåD?†Ý@óžÞœT˜‰h”Ámb;¦{ñ!—}'†´¥¶ZP°î죃Z­­í®ŠÝª.=BL‰ÆE
+>qÄ^Z"P=wí)­ÆbÚ’î^©[¡y®ÊPŠ3Ii!uîÿìQ;&ϹÑ:­¡B<¹hS#´øôk͐ذ³¤H¦/VçwpÖ²ÎÔY7‚;× %©®kø1Ùê«‘Ol­m~u#®ZmÑT<Ùm‰èŸÄü`¶*T'Ä…rØžTÃcÜ¿Ú
+c‹NdÓ ¥µó<ÇZÒƒD=ª³œÔí£Ël^ûçg‹E	[:§{ÓJøcJÿ²¶ÞÎéÙ‰Pö}ôêǦ¢ì	$ôf6¾Û!ç=½W}
+•^Ï0/‰£PrCAš•˜ºèÃÀð °)ˤâlÛ`wãh7[»I0‰å—
+7µlS6åC°ùåsÏ€ðã!ïÓFë2¨þQßma³VaÉœkaÓ°üîäÆæ]¹š©sPÂÛ<%(ÈäG,ˆ² æ½PG]©M²ª*„­Ô–,êe¯V(W5êÐiƒ)mŸÕÑ’/„=+Âyž2’9ZgªŠ›pZýšêE'–ªœøqzð{Ôï(ǸZ•üþécõS¥“²[çh¸¶Ì¦éghý,`'¾‡×b×dúr¥Öøf›pŒüzZLè¸1~fáîü yÌñ™ïEõ‚WOKvžZY.Ø|·œnÕÒ£æ¶õ4Di.mT¨ok<¨ëKìSñJk£‘‰``K]Z[³žñIù[5´Jÿ…6¤RU¹º÷ç,w³õÀ»@Té6ÊûÚ…´Üè¢#a,v”†õ€v‹ ä6î;~o £YjBvßû_ј“»±›kbƈ…
+¾ã9^7S“$¯n³#‰ŒQânÌ·¸¤‰øàv¨	'àž¶\ºŽa4­‚döÀwð¿]ñò܉‹
\ No newline at end of file

Modified: packages/cairocffi/trunk/debian/control
===================================================================
--- packages/cairocffi/trunk/debian/control	2014-09-22 20:49:42 UTC (rev 30719)
+++ packages/cairocffi/trunk/debian/control	2014-09-22 21:37:45 UTC (rev 30720)
@@ -3,15 +3,14 @@
 Uploaders: Jean-Christophe Jaskula <jean.christophe.jaskula at gmail.com>
 Section: python
 Priority: optional
-Build-Depends: 	python-all (>= 2.6.6-3), 
-		debhelper (>= 9), 
-		python-all-dev, 
+Build-Depends: python-all (>= 2.6.6-3), 
+		debhelper (>= 9),
+		dh-python,  
+		quilt,
 		python-setuptools, 
-		python3-all, 
-		python3-all-dev, 
-		python3-setuptools, 
-		quilt, 
-		python-cffi, python3-cffi, 
+		python3-all,  
+		python3-setuptools,
+		python-cffi, python3-cffi,
 		python-sphinx | python3-sphinx, 
 		python-pytest, python3-pytest, 
 		libcairo2, 
@@ -22,35 +21,39 @@
 X-Python3-Version: >= 3.2
 Standards-Version: 3.9.5
 Homepage: https://pythonhosted.org/cairocffi/
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/cairocffi/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/cairocffi/trunk/
 
 Package: python-cairocffi
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-cffi, libcairo2
-Description: cffi-based cairo bindings for Python
+Depends: ${misc:Depends}, ${python:Depends}, python-cffi, libcairo2, libgdk-pixbuf2.0-0
+Suggests: python-cairocffi-doc
+Description: cffi-based cairo bindings for Python 
  cairocffi is a CFFI-based drop-in replacement for Pycairo,
  a set of Python bindings and object-oriented API for cairo.
  Cairo is a 2D vector graphics library with support for multiple backends
  including image buffers, PNG, PostScript, PDF, and SVG file output.
- .
 
 Package: python3-cairocffi
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}, python3-cffi, libcairo2
-Description: cffi-based cairo bindings for Python
+Depends: ${misc:Depends}, ${python3:Depends}, python3-cffi, libcairo2, libgdk-pixbuf2.0-0
+Suggests: python-cairocffi-doc
+Description: cffi-based cairo bindings for Python (Python3)
  cairocffi is a CFFI-based drop-in replacement for Pycairo,
  a set of Python bindings and object-oriented API for cairo.
  Cairo is a 2D vector graphics library with support for multiple backends
  including image buffers, PNG, PostScript, PDF, and SVG file output.
  .
+ This package contains the Python 3 version of cairocffi.  
 
 Package: python-cairocffi-doc
 Architecture: all
 Depends: ${sphinxdoc:Depends}, ${misc:Depends}
 Section: doc
-Description: cffi-based cairo bindings for Python
+Description: cffi-based cairo bindings for Python - Documentation
  cairocffi is a CFFI-based drop-in replacement for Pycairo,
  a set of Python bindings and object-oriented API for cairo.
  Cairo is a 2D vector graphics library with support for multiple backends
  including image buffers, PNG, PostScript, PDF, and SVG file output.
  .
-
+ This package contains the documentation related to cairocffi.

Modified: packages/cairocffi/trunk/debian/copyright
===================================================================
--- packages/cairocffi/trunk/debian/copyright	2014-09-22 20:49:42 UTC (rev 30719)
+++ packages/cairocffi/trunk/debian/copyright	2014-09-22 21:37:45 UTC (rev 30720)
@@ -3,7 +3,7 @@
 Source: https://github.com/SimonSapin/cairocffi
 
 Files: *
-Copyright: 2014 Simon Sapin <simon.sapin at exyr.org>
+Copyright: 2013 Simon Sapin <simon.sapin at exyr.org>
 License: BSD-3-clause
  Some rights reserved.
  .
@@ -35,26 +35,35 @@
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# If you want to use GPL v2 or later for the /debian/* files use 
-# the following clauses, or change it to suit. Delete these two lines
 Files: debian/*
 Copyright: 2014 Jean-Christophe Jaskula <jean.christophe.jaskula at gmail.com>
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+License: BSD-3-clause
+ Some rights reserved.
  .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
  .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
  .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-# Please avoid to pick license terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.
+ * Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+ .
+ * The names of the contributors may not be used to endorse or
+   promote products derived from this software without specific
+   prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Added: packages/cairocffi/trunk/debian/patches/fix_import_sphinxdoc.patch
===================================================================
--- packages/cairocffi/trunk/debian/patches/fix_import_sphinxdoc.patch	                        (rev 0)
+++ packages/cairocffi/trunk/debian/patches/fix_import_sphinxdoc.patch	2014-09-22 21:37:45 UTC (rev 30720)
@@ -0,0 +1,14 @@
+Description: Add cairocffi local module path so Sphinx can find them during the build
+Last-Update: 2014-09-22
+
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -1,5 +1,8 @@
+ import re
+ import os
++import sys
++sys.path.insert(0, os.path.abspath(".."))
++
+ 
+ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx',
+               'sphinx.ext.coverage']

Added: packages/cairocffi/trunk/debian/patches/series
===================================================================
--- packages/cairocffi/trunk/debian/patches/series	                        (rev 0)
+++ packages/cairocffi/trunk/debian/patches/series	2014-09-22 21:37:45 UTC (rev 30720)
@@ -0,0 +1,2 @@
+fix_import_sphinxdoc.patch
+use_local_objects.inv.patch

Added: packages/cairocffi/trunk/debian/patches/use_local_objects.inv.patch
===================================================================
--- packages/cairocffi/trunk/debian/patches/use_local_objects.inv.patch	                        (rev 0)
+++ packages/cairocffi/trunk/debian/patches/use_local_objects.inv.patch	2014-09-22 21:37:45 UTC (rev 30720)
@@ -0,0 +1,13 @@
+Description: Use a local copy of object.inv from doc.python.org and cairographics.scipy.org, instead of downloading them each time from the internet
+Last-Update: 2014-09-22
+
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -18,5 +18,5 @@
+ autodoc_member_order = 'bysource'
+ autodoc_default_flags = ['members']
+ intersphinx_mapping = {
+-    'http://docs.python.org/': None,
+-    'http://cairographics.org/documentation/pycairo/2/': None}
++    'http://docs.python.org/': '../debian/python.org_objects.inv',
++    'http://cairographics.org/documentation/pycairo/2/': '../debian/cairographics.org_pycairo2_objects.inv'}

Added: packages/cairocffi/trunk/debian/python-cairocffi-doc.doc-base
===================================================================
--- packages/cairocffi/trunk/debian/python-cairocffi-doc.doc-base	                        (rev 0)
+++ packages/cairocffi/trunk/debian/python-cairocffi-doc.doc-base	2014-09-22 21:37:45 UTC (rev 30720)
@@ -0,0 +1,14 @@
+Document: python-cairocffi-doc
+Title: cairocffi documentation
+Author: cairocffi Developers
+Abstract: cffi-based cairo bindings for Python
+ cairocffi is a CFFI-based drop-in replacement for Pycairo,
+ a set of Python bindings and object-oriented API for cairo.
+ Cairo is a 2D vector graphics library with support for multiple backends
+ including image buffers, PNG, PostScript, PDF, and SVG file output.
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-cairocffi-doc/html/index.html
+Files: /usr/share/doc/python-cairocffi-doc/html/*
+

Modified: packages/cairocffi/trunk/debian/python-cairocffi-doc.docs
===================================================================
--- packages/cairocffi/trunk/debian/python-cairocffi-doc.docs	2014-09-22 20:49:42 UTC (rev 30719)
+++ packages/cairocffi/trunk/debian/python-cairocffi-doc.docs	2014-09-22 21:37:45 UTC (rev 30720)
@@ -1 +1,2 @@
 docs/_build/html
+utils

Added: packages/cairocffi/trunk/debian/python.org_objects.inv
===================================================================
(Binary files differ)


Property changes on: packages/cairocffi/trunk/debian/python.org_objects.inv
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: packages/cairocffi/trunk/debian/rules
===================================================================
--- packages/cairocffi/trunk/debian/rules	2014-09-22 20:49:42 UTC (rev 30719)
+++ packages/cairocffi/trunk/debian/rules	2014-09-22 21:37:45 UTC (rev 30720)
@@ -8,20 +8,23 @@
 export PYBUILD_AFTER_TEST=rm -rf {build_dir}/*/__pycache__
 
 %:
-	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+	dh $@ --with python2,python3,sphinxdoc,quilt --buildsystem=pybuild
 
 override_dh_auto_test:
 	LC_ALL=C.UTF-8 dh_auto_test
 
 override_dh_auto_build:
 	dh_auto_build
-	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bhtml docs/ docs/_build/html
+	sphinx-build -N -bhtml docs/ docs/_build/html
 
 override_dh_clean:
 	dh_clean
 	rm -rf docs/_build
 
-override_dh_sphinxdoc:
-ifneq "$(shell dh_listpackages | grep -- -doc)" ""
-	dh_sphinxdoc
-endif
+update_intersphinx_mapping:
+	wget http://docs.python.org/dev/objects.inv -O debian/python.org_objects.inv
+	wget http://cairographics.org/documentation/pycairo/2/objects.inv -O debian/cairographics.org_pycairo2_objects.inv
+
+#override_dh_install:
+#	install utils debian/python-cairocffi-doc/usr/share/doc/python-cairocffi-doc/
+#	dh_install

Added: packages/cairocffi/trunk/debian/source/include-binaries
===================================================================
--- packages/cairocffi/trunk/debian/source/include-binaries	                        (rev 0)
+++ packages/cairocffi/trunk/debian/source/include-binaries	2014-09-22 21:37:45 UTC (rev 30720)
@@ -0,0 +1,2 @@
+debian/cairographics.org_pycairo2_objects.inv
+debian/python.org_objects.inv

More information about the Python-modules-commits mailing list