--- pyyaml-3.10.orig/debian/README.source +++ pyyaml-3.10/debian/README.source @@ -0,0 +1,58 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + break + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command. --- pyyaml-3.10.orig/debian/changelog +++ pyyaml-3.10/debian/changelog @@ -0,0 +1,211 @@ +pyyaml (3.10-4build4) trusty; urgency=medium + + * No change rebuild to drop python3.3 compiled extension. + + -- Dimitri John Ledkov Tue, 01 Apr 2014 14:43:47 +0100 + +pyyaml (3.10-4build3) trusty; urgency=medium + + * Rebuild for python3.4 as a supported python version. + + -- Matthias Klose Sat, 04 Jan 2014 19:32:47 +0000 + +pyyaml (3.10-4build2) raring; urgency=low + + * Rebuild to drop python3.2 extension. + + -- Matthias Klose Thu, 08 Nov 2012 11:16:44 +0000 + +pyyaml (3.10-4build1) raring; urgency=low + + * No-change upload to build for python3.3. + + -- Matthias Klose Mon, 22 Oct 2012 17:20:11 +0200 + +pyyaml (3.10-4) unstable; urgency=low + + * Bump debian/compat and minimum debhelper version to 9 for dpkg-buildflags + and hardening support + * Drop unneeded XB-Python-Version from python-yaml + + -- Scott Kitterman Tue, 26 Jun 2012 11:19:50 -0400 + +pyyaml (3.10-3) unstable; urgency=low + + * Regenerate ext_yaml.c during build + - Update debian/rules to move the upstream file aside during build + - Add cython and cython-dbg to build-depends + * Add quilt patch system + - Add quilt to build-depends + - Add --with quilt to debian/rules + - Add README.source + * Add debian/patches/size_t_not_int.diff to fix FTBFS on S390x + (Closes: #676536) + - Thanks to Julien Cristau for the patch + * Rework debian/rules to support DEB_BUILD_OPTIONS nocheck + * Bump standards version to 3.9.3 without further change + + -- Scott Kitterman Fri, 08 Jun 2012 16:36:33 -0400 + +pyyaml (3.10-2) unstable; urgency=low + + * Remove python3-yaml-dbg find rule in debian/rules so python3 debug package + is built correctly (Closes: #650950) + * Remove similar rule for python-yaml-dbg since it is not needed + * Fix short descriptions for debug packages so they are not the same as + non-debug packages + * Also ship upstream changelog in python-yaml + * Add python3-yaml.docs to README/CHANGES are shipped in python3-yaml + * Bump standards version to 3.9.2 without further change + + -- Scott Kitterman Sun, 04 Dec 2011 13:48:42 -0500 + +pyyaml (3.10-1) unstable; urgency=low + + * New upstream release (LP: #770895) + * Override dh_auto_test to run tests in the right part of the build + * Protect for loops in debian/rules with set -e + * Use install-layout=deb to avoid files landing in /usr/local + * Drop XB-Python-Version from python-yaml (obsolete) + + -- Scott Kitterman Tue, 31 May 2011 16:18:44 -0400 + +pyyaml (3.09-5) unstable; urgency=low + + * Team upload. + * Bump minimum required python3-all-dev version to 3.1.2-10 + (and rebuild for /usr/lib/python3/dist-packages transtion) + + -- Piotr Ożarowski Sun, 26 Sep 2010 22:15:21 +0200 + +pyyaml (3.09-4) unstable; urgency=low + + * Switch from incorrect use of XS-Python-Version to X-Python-Version and + X-Python3-Version to work with current pyversions/py3versions + * Use ${python3:Depends} instead of ${python:Depends} for python3-yaml + (Closes: #591957) + * Rebuild with recent dh_python3 to fix pre-removal script (Closes: #591652) + * Drop XB-Python-Version from python3 packages (only relates to Python) + * Bump standards version to 3.9.1 without further change + + -- Scott Kitterman Fri, 13 Aug 2010 23:48:51 -0400 + +pyyaml (3.09-3) unstable; urgency=low + + * Convert from CDBS to Debhelper + - Port rules from cdbs to debhelper + - Drop cdbs from build-depends + * Convert from python-support to dh_python2 + - Drop python-central from build-depends + - Switch to --with python2 in debian/rules + - Bump python-all-dev build-depend version to 2.6.5-2~ + * Add support for Python3 + - Add python3-yaml and python3-yaml-dbg to debian/control + - Add python3-all-dev and python3-all-dbg to build-depends + - Add >= 3.0 to XS-Python-Version + - Adjust debian rules to build --with python3 + * Change priority to optional to match override + * Bump standards version to 3.8.4 without further change + * Remove DM-Upload-Allowed + + -- Scott Kitterman Sun, 20 Jun 2010 20:50:44 -0400 + +pyyaml (3.09-2) unstable; urgency=low + + * Update XB-Python-Version for Python 2.6 transition (closes: #556160) + * Move python-yaml-dbg to section debug + * Use correct © symbol in debian/copyright + + -- Scott Kitterman Fri, 13 Nov 2009 18:22:57 -0500 + +pyyaml (3.09-1) unstable; urgency=low + + * New upstream release + * Update standards version to 3.8.3 without further change + + -- Scott Kitterman Mon, 31 Aug 2009 10:02:36 -0400 + +pyyaml (3.08-1) unstable; urgency=low + + * New upstream release + - Change debian/rules to run new upstream test suite during build + - Version libyaml-dev build dep to 0.1.2~ due to test failures with 0.1.1 + * Change priority to extra due to libyaml being extra + * Add ${misc:Depends} to python-yaml and python-yaml-dbg + * Update package description to mention being built against libyaml + + -- Scott Kitterman Fri, 02 Jan 2009 23:57:37 -0500 + +pyyaml (3.06-1) unstable; urgency=low + + [ Sandro Tosi ] + * debian/control + - switch Vcs-Browser field to viewsvn + + [ Scott Kitterman ] + * New upstream release + - Dropped build-dep on python-pyrex (no longer used) + - Update debian/rules to build with the new libyaml integration scheme + * Comment out simple-patchsys.mk in debian/rules since it's not currently + needed + + -- Scott Kitterman Mon, 03 Nov 2008 21:17:42 -0500 + +pyyaml (3.05-2) unstable; urgency=low + + [ Piotr Ożarowski ] + * Vcs-Browser and Homepage fields added + * XS-Vcs-Svn field renamed to Vcs-Svn + * DM-Upload-Allowed set to "yes" + + [ Sandro Tosi ] + * debian/control + - uniforming Vcs-Browser field + + [ Scott Kitterman ] + * Build with lib-yaml now that it is in the archive (Closes: #435410) + - Add build-dep on libyaml-dev and python-pyrex + - Add depends for ${shlibs:Depends} (Package falls back to pure Python + if libyaml is not present, but it's not worth splitting a small package) + - Install with setup_with_libyaml.py for all Python versions + - Switch from arch all to arch any + * Add debug package + - Add python-all-dbg to build-dep + - Add python-yaml-dbg to debian/control + - Update debian/rules + * Switch from python-support to python-central + - Update depends + - Remove pyversions + - Add XS/XB-python-versions to debian/control + - Update debian/rules + * Update package description + * Update standards version to 3.8.0.1 + + -- Scott Kitterman Tue, 24 Jun 2008 21:32:45 -0400 + +pyyaml (3.05-1) unstable; urgency=low + + [ Scott Kitterman ] + * New upstream version + * Removed obsolete patch and debian/patches + * debian/control: + - Added XS-Vcs-Svn field + - Remove build-dep on pacht-utils + * debian/rules: + - Comment out simple-patchsys + + [ Piotr Ożarowski ] + * Added debian/watch file + + -- Scott Kitterman Sun, 13 May 2007 22:38:17 -0400 + +pyyaml (3.04-1) unstable; urgency=low + + * Initial Debian package (Closes: #413720) + * Include upstream recommended patches from the development tree: + - fix loading an empty stream: changeset 233 + - fix the !timestamp constructor: changeset 234 + - fix an obscure issue with yaml_path_resolver: changeset 246 + + -- Scott Kitterman Wed, 4 Apr 2007 15:50:36 -0400 + --- pyyaml-3.10.orig/debian/compat +++ pyyaml-3.10/debian/compat @@ -0,0 +1 @@ +9 --- pyyaml-3.10.orig/debian/control +++ pyyaml-3.10/debian/control @@ -0,0 +1,57 @@ +Source: pyyaml +Section: python +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Python Modules Team +Uploaders: Scott Kitterman +Build-Depends: debhelper (>= 9), python-all-dev (>=2.6.5-13~), python-all-dbg, python3-all-dev (>= 3.1.2-10~), python3-all-dbg, libyaml-dev (>=0.1.2~), cython, cython-dbg, quilt +X-Python-Version: >= 2.4 +X-Python3-Version: >= 3.0 +Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyyaml/trunk/ +Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyyaml/trunk/ +Standards-Version: 3.9.3 +Homepage: http://pyyaml.org/ + +Package: python-yaml +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} +Description: YAML parser and emitter for Python + Python-yaml is a complete YAML 1.1 parser and emitter for Python. It can parse + all examples from the specification. The parsing algorithm is simple enough to + be a reference for YAML parser implementors. A simple extension API is also + provided. The package is built using libyaml for improved speed. + +Package: python-yaml-dbg +Section: debug +Priority: extra +Architecture: any +Depends: python-yaml (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends} +Description: YAML parser and emitter for Python (debug build) + Python-yaml is a complete YAML 1.1 parser and emitter for Python. It can parse + all examples from the specification. The parsing algorithm is simple enough to + be a reference for YAML parser implementors. A simple extension API is also + provided. The package is built using libyaml for improved speed. + . + This package contains the extension built for the Python debug interpreter. + +Package: python3-yaml +Architecture: any +Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends} +Description: YAML parser and emitter for Python3 + Python3-yaml is a complete YAML 1.1 parser and emitter for Python3. It can + parse all examples from the specification. The parsing algorithm is simple + enough to be a reference for YAML parser implementors. A simple extension API + is also provided. The package is built using libyaml for improved speed. + +Package: python3-yaml-dbg +Section: debug +Priority: extra +Architecture: any +Depends: python3-yaml (= ${binary:Version}), python3-dbg, ${shlibs:Depends}, ${misc:Depends} +Description: YAML parser and emitter for Python3 (debug build) + Python3-yaml is a complete YAML 1.1 parser and emitter for Python3. It can + parse all examples from the specification. The parsing algorithm is simple + enough to be a reference for YAML parser implementors. A simple extension API + is also provided. The package is built using libyaml for improved speed. + . + This package contains the extension built for the Python3 debug interpreter. --- pyyaml-3.10.orig/debian/copyright +++ pyyaml-3.10/debian/copyright @@ -0,0 +1,32 @@ +This package was debianized by Scott Kitterman on +Fri, 09 Feb 2007 12:12:29 -0500. + +The maintainer is Debian Python Modules Team + + +It was downloaded from http://pyyaml.org/ + +Copyright Holder: Copyright © 2006 Kirill Simonov + +License: + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +The Debian packaging is © 2007, Scott Kitterman and +is licensed under the same terms as PyYAML, see above. --- pyyaml-3.10.orig/debian/patches/series +++ pyyaml-3.10/debian/patches/series @@ -0,0 +1 @@ +size_t_not_int.diff --- pyyaml-3.10.orig/debian/patches/size_t_not_int.diff +++ pyyaml-3.10/debian/patches/size_t_not_int.diff @@ -0,0 +1,73 @@ +pyyaml FTBFS on the s390x buildd. It seems this is due to using int +where the libyaml API uses size_t. I tested the attached patch in +zelenka.d.o's sid chroot, and at least the python2 build/test worked (it +failed with the same error as the buildd pre-patching). +Patch by Julien Cristau +Add to the pyyaml package by Scott Kitterman +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676536 + +Index: pyyaml-3.10/ext/_yaml.pxd +=================================================================== +--- pyyaml-3.10.orig/ext/_yaml.pxd 2011-05-29 23:31:01.000000000 -0400 ++++ pyyaml-3.10/ext/_yaml.pxd 2012-06-08 16:33:54.309407701 -0400 +@@ -86,15 +86,15 @@ + YAML_MAPPING_END_EVENT + + ctypedef int yaml_read_handler_t(void *data, char *buffer, +- int size, int *size_read) except 0 ++ size_t size, size_t *size_read) except 0 + + ctypedef int yaml_write_handler_t(void *data, char *buffer, +- int size) except 0 ++ size_t size) except 0 + + ctypedef struct yaml_mark_t: +- int index +- int line +- int column ++ size_t index ++ size_t line ++ size_t column + ctypedef struct yaml_version_directive_t: + int major + int minor +@@ -113,7 +113,7 @@ + char *suffix + ctypedef struct _yaml_token_scalar_data_t: + char *value +- int length ++ size_t length + yaml_scalar_style_t style + ctypedef struct _yaml_token_version_directive_data_t: + int major +@@ -152,7 +152,7 @@ + char *anchor + char *tag + char *value +- int length ++ size_t length + int plain_implicit + int quoted_implicit + yaml_scalar_style_t style +Index: pyyaml-3.10/ext/_yaml.pyx +=================================================================== +--- pyyaml-3.10.orig/ext/_yaml.pyx 2011-05-29 23:31:01.000000000 -0400 ++++ pyyaml-3.10/ext/_yaml.pyx 2012-06-08 16:33:54.313409701 -0400 +@@ -905,7 +905,7 @@ + raise error + return 1 + +-cdef int input_handler(void *data, char *buffer, int size, int *read) except 0: ++cdef int input_handler(void *data, char *buffer, size_t size, size_t *read) except 0: + cdef CParser parser + parser = data + if parser.stream_cache is None: +@@ -1515,7 +1515,7 @@ + self.ascend_resolver() + return 1 + +-cdef int output_handler(void *data, char *buffer, int size) except 0: ++cdef int output_handler(void *data, char *buffer, size_t size) except 0: + cdef CEmitter emitter + emitter = data + if emitter.dump_unicode == 0: --- pyyaml-3.10.orig/debian/python-yaml.docs +++ pyyaml-3.10/debian/python-yaml.docs @@ -0,0 +1,2 @@ +README +changelog --- pyyaml-3.10.orig/debian/python-yaml.examples +++ pyyaml-3.10/debian/python-yaml.examples @@ -0,0 +1,2 @@ +examples/* + --- pyyaml-3.10.orig/debian/python3-yaml.docs +++ pyyaml-3.10/debian/python3-yaml.docs @@ -0,0 +1,2 @@ +README +changelog --- pyyaml-3.10.orig/debian/rules +++ pyyaml-3.10/debian/rules @@ -0,0 +1,80 @@ +#!/usr/bin/make -f + +buildvers := $(shell pyversions -sv) +build3vers := $(shell py3versions -sv) + +%: + dh $@ --with python2, --with python3, --with quilt + +override_dh_auto_build: + +override_dh_auto_install: + # Move generated _yaml.c aside so we can regenerate it during build + mv $(CURDIR)/ext/_yaml.c $(CURDIR)/upstream.yaml.c + + dh_install -ppython-yaml + set -e && for i in $(buildvers); do \ + python$$i ./setup.py install --install-layout=deb --root $(CURDIR)/debian/python-yaml; \ + done + + dh_install -ppython-yaml-dbg + set -e && for i in $(buildvers); do \ + python$$i-dbg ./setup.py install --install-layout=deb --root $(CURDIR)/debian/python-yaml-dbg; \ + done + + dh_install -ppython3-yaml + set -e && for i in $(build3vers); do \ + python$$i ./setup.py install --install-layout=deb --root $(CURDIR)/debian/python3-yaml; \ + done + + dh_install -ppython3-yaml-dbg + set -e && for i in $(build3vers); do \ + python$$i-dbg ./setup.py install --install-layout=deb --root $(CURDIR)/debian/python3-yaml-dbg; \ + done + +ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) + set -e && for i in $(buildvers); do \ + echo "-- running tests for "$$i" plain --" ; \ + python$$i -c "import sys ; sys.path.insert(0, 'debian/python-yaml/usr/lib/python$$i/dist-packages/'); \ + sys.path.insert(0, 'tests/lib'); import test_all; test_all.main([])";\ + done + + set -e && for i in $(buildvers); do \ + echo "-- running tests for "$$i" debug --" ; \ + python$$i-dbg -c "import sys ; sys.path.insert(0, 'debian/python-yaml-dbg/usr/lib/python$$i/dist-packages/'); \ + sys.path.insert(0, 'tests/lib'); import test_all; test_all.main([])";\ + done + + set -e && for i in $(build3vers); do \ + echo "-- running tests for "$$i" plain --" ; \ + python$$i -c "import sys ; sys.path.insert(0, 'debian/python3-yaml/usr/lib/python3/dist-packages/'); \ + sys.path.insert(0, 'tests/lib3'); import test_all; test_all.main([])";\ + done + + set -e && for i in $(build3vers); do \ + echo "-- running tests for "$$i" debug --" ; \ + python$$i -c "import sys ; sys.path.insert(0, 'debian/python3-yaml-dbg/usr/lib/python3/dist-packages/'); \ + sys.path.insert(0, 'tests/lib3'); import test_all; test_all.main([])";\ + done +endif + + # Put upstream _yaml.c back where we found it + mv $(CURDIR)/upstream.yaml.c $(CURDIR)/ext/_yaml.c + +override_dh_installdocs: + cp $(CURDIR)/CHANGES $(CURDIR)/changelog + dh_installdocs + rm $(CURDIR)/changelog + +override_dh_installdeb: + rm -rf $(CURDIR)/debian/python-yaml-dbg/usr/share/doc/python-yaml-dbg + ln -s python-yaml debian/python-yaml-dbg/usr/share/doc/python-yaml-dbg + + rm -rf $(CURDIR)/debian/python3-yaml-dbg/usr/share/doc/python3-yaml-dbg + ln -s python3-yaml debian/python3-yaml-dbg/usr/share/doc/python3-yaml-dbg + + dh_installdeb + +override_dh_clean: + dh_clean + rm -rf $(CURDIR)/build --- pyyaml-3.10.orig/debian/watch +++ pyyaml-3.10/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://pyyaml.org/download/pyyaml/PyYAML-(.*)\.tar\.gz debian uupdate +