[Python-modules-commits] r13478 - in packages/pyyaml/trunk/debian (4 files)

Fri Jun 18 13:16:27 UTC 2010

Date: Friday, June 18, 2010 @ 13:16:16
  Author: kitterman
Revision: 13478

  * 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

Modified:
  packages/pyyaml/trunk/debian/changelog
  packages/pyyaml/trunk/debian/control
  packages/pyyaml/trunk/debian/rules
Deleted:
  packages/pyyaml/trunk/debian/source/

Modified: packages/pyyaml/trunk/debian/changelog
===================================================================

--- packages/pyyaml/trunk/debian/changelog	2010-06-18 12:30:25 UTC (rev 13477)
+++ packages/pyyaml/trunk/debian/changelog	2010-06-18 13:16:16 UTC (rev 13478)
@@ -1,9 +1,22 @@
 pyyaml (3.09-3) UNRELEASED; urgency=low
 
-  * Move pyyaml back to priority optional now that libyaml is optional
-    - See #568651 for details
+  * 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 <scott at kitterman.com>  Sat, 06 Feb 2010 11:51:07 -0500
+ -- Scott Kitterman <scott at kitterman.com>  Thu, 17 Jun 2010 23:50:44 -0400
 
 pyyaml (3.09-2) unstable; urgency=low
 

Modified: packages/pyyaml/trunk/debian/control
===================================================================
--- packages/pyyaml/trunk/debian/control	2010-06-18 12:30:25 UTC (rev 13477)
+++ packages/pyyaml/trunk/debian/control	2010-06-18 13:16:16 UTC (rev 13478)
@@ -3,13 +3,12 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org> 
 Uploaders: Scott Kitterman <scott at kitterman.com>
-Build-Depends: debhelper (>= 5), cdbs (>=0.4.48), python-all-dev (>=2.3.5-11), python-all-dbg, python-central (>= 0.6), libyaml-dev (>=0.1.2~)
-XS-Python-Version: all 
+Build-Depends: debhelper (>= 7.3.16), python-all-dev (>=2.6.5-2~), python-all-dbg, python3-all-dev (>= 3.1.2-1~), python3-all-dbg, libyaml-dev (>=0.1.2~)
+XS-Python-Version: >= 2.4, >= 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.8.3
+Standards-Version: 3.8.4
 Homepage: http://pyyaml.org/
-DM-Upload-Allowed: yes
 
 Package: python-yaml
 Architecture: any
@@ -23,6 +22,7 @@
 
 Package: python-yaml-dbg
 Section: debug
+Priority: extra
 Architecture: any
 Depends: python-yaml (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends}
 XB-Python-Version: ${python:Versions}
@@ -33,3 +33,27 @@
  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: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+XB-Python-Version: ${python:Versions}
+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}
+XB-Python-Version: ${python:Versions}
+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.
+ .
+ This package contains the extension built for the Python3 debug interpreter.

Modified: packages/pyyaml/trunk/debian/rules
===================================================================
--- packages/pyyaml/trunk/debian/rules	2010-06-18 12:30:25 UTC (rev 13477)
+++ packages/pyyaml/trunk/debian/rules	2010-06-18 13:16:16 UTC (rev 13478)
@@ -1,32 +1,54 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM=pycentral
-DEB_COMPRESS_EXCLUDE := .py
+buildvers := $(shell pyversions -sv)
+build3vers := $(shell py3versions -sv)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-#include /usr/share/cdbs/1/rules/simple-patchsys.mk
+%:
+	dh $@ --with python2, --with python3
 
-build/python-yaml::
+override_dh_build:
+	dh_build
 	python setup.py test
+	python3 setup.py test
 
-install/python-yaml::
-	for i in $(cdbs_python_build_versions); do \
+override_dh_install:
+	dh_install -ppython-yaml 
+	for i in $(buildvers); do \
 	  python$$i ./setup.py install --root $(CURDIR)/debian/python-yaml; \
 	done
 
-install/python-yaml-dbg::
-	for i in $(cdbs_python_build_versions); do \
+	dh_install -ppython-yaml-dbg
+	for i in $(buildvers); do \
 	  python$$i-dbg ./setup.py install --root $(CURDIR)/debian/python-yaml-dbg; \
 	done
 	find debian/python-yaml-dbg \
 	  ! -type d ! -name '*_d.so' | xargs rm -f
 	find debian/python-yaml-dbg -depth -empty -exec rmdir {} \;
 
-binary-predeb/python-yaml-dbg::
+	dh_install -ppython3-yaml
+	for i in $(build3vers); do \
+	  python$$i ./setup.py install --root $(CURDIR)/debian/python3-yaml; \
+	done
+
+	dh_install -ppython3-yaml-dbg
+	for i in $(build3vers); do \
+	  python$$i-dbg ./setup.py install --root $(CURDIR)/debian/python3-yaml-dbg; \
+	done
+	find debian/python3-yaml-dbg \
+	  ! -type d ! -name '*_d.so' | xargs rm -f
+	find debian/python3-yaml-dbg -depth -empty -exec rmdir {} \;
+
+	dh_install
+
+override_dh_installdeb:
 	rm -rf 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 debian/python3-yaml-dbg/usr/share/doc/python3-yaml-dbg
+	ln -s python3-yaml debian/python3-yaml-dbg/usr/share/doc/python3-yaml-dbg
 
-clean::
+	dh_installdeb
+
+override_dh_clean:
+	dh_clean
 	rm -rf build


