[Python-modules-commits] r19510 - in packages/pyyaml/trunk/debian (5 files)

[kitterman at users.alioth.debian.org]

    Date: Monday, December 5, 2011 @ 02:45:21
  Author: kitterman
Revision: 19510

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

Added:
  packages/pyyaml/trunk/debian/python3-yaml.docs
Modified:
  packages/pyyaml/trunk/debian/changelog
  packages/pyyaml/trunk/debian/control
  packages/pyyaml/trunk/debian/python-yaml.docs
  packages/pyyaml/trunk/debian/rules

Modified: packages/pyyaml/trunk/debian/changelog
===================================================================
--- packages/pyyaml/trunk/debian/changelog	2011-12-04 22:30:13 UTC (rev 19509)
+++ packages/pyyaml/trunk/debian/changelog	2011-12-05 02:45:21 UTC (rev 19510)
@@ -1,3 +1,16 @@
+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 <scott at kitterman.com>  Sun, 04 Dec 2011 13:48:42 -0500
+
 pyyaml (3.10-1) unstable; urgency=low
 
   * New upstream release (LP: #770895)

Modified: packages/pyyaml/trunk/debian/control
===================================================================
--- packages/pyyaml/trunk/debian/control	2011-12-04 22:30:13 UTC (rev 19509)
+++ packages/pyyaml/trunk/debian/control	2011-12-05 02:45:21 UTC (rev 19510)
@@ -8,7 +8,7 @@
 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.1
+Standards-Version: 3.9.2
 Homepage: http://pyyaml.org/
 
 Package: python-yaml
@@ -26,7 +26,7 @@
 Priority: extra
 Architecture: any
 Depends: python-yaml (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends}
-Description: YAML parser and emitter for Python
+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
@@ -48,7 +48,7 @@
 Priority: extra
 Architecture: any
 Depends: python3-yaml (= ${binary:Version}), python3-dbg, ${shlibs:Depends}, ${misc:Depends}
-Description: YAML parser and emitter for Python3
+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

Modified: packages/pyyaml/trunk/debian/python-yaml.docs
===================================================================
--- packages/pyyaml/trunk/debian/python-yaml.docs	2011-12-04 22:30:13 UTC (rev 19509)
+++ packages/pyyaml/trunk/debian/python-yaml.docs	2011-12-05 02:45:21 UTC (rev 19510)
@@ -1 +1,2 @@
 README
+changelog

Added: packages/pyyaml/trunk/debian/python3-yaml.docs
===================================================================
--- packages/pyyaml/trunk/debian/python3-yaml.docs	                        (rev 0)
+++ packages/pyyaml/trunk/debian/python3-yaml.docs	2011-12-05 02:45:21 UTC (rev 19510)
@@ -0,0 +1,2 @@
+README
+changelog

Modified: packages/pyyaml/trunk/debian/rules
===================================================================
--- packages/pyyaml/trunk/debian/rules	2011-12-04 22:30:13 UTC (rev 19509)
+++ packages/pyyaml/trunk/debian/rules	2011-12-05 02:45:21 UTC (rev 19510)
@@ -20,9 +20,6 @@
 	set -e && for i in $(buildvers); do \
 	  python$$i-dbg ./setup.py install --install-layout=deb --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 {} \;
 
 	dh_install -ppython3-yaml
 	set -e && for i in $(build3vers); do \
@@ -33,12 +30,14 @@
 	set -e && for i in $(build3vers); do \
 	  python$$i-dbg ./setup.py install --install-layout=deb --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_installdocs:
+	cp $(CURDIR)/CHANGES $(CURDIR)/changelog
+	dh_installdocs
+	rm  $(CURDIR)/changelog
+
 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