[Python-modules-commits] r21550 - in packages/python-dexml/trunk/debian (6 files)

[janos-guest at users.alioth.debian.org]

    Date: Friday, May 4, 2012 @ 16:20:49
  Author: janos-guest
Revision: 21550

Release 0.4.2-2 to unstable. (Closes: #671100)

Added:
  packages/python-dexml/trunk/debian/source/local-options
  packages/python-dexml/trunk/debian/source/options
Modified:
  packages/python-dexml/trunk/debian/changelog
  packages/python-dexml/trunk/debian/control
  packages/python-dexml/trunk/debian/copyright
  packages/python-dexml/trunk/debian/rules

Modified: packages/python-dexml/trunk/debian/changelog
===================================================================
--- packages/python-dexml/trunk/debian/changelog	2012-05-04 14:47:33 UTC (rev 21549)
+++ packages/python-dexml/trunk/debian/changelog	2012-05-04 16:20:49 UTC (rev 21550)
@@ -1,8 +1,19 @@
 python-dexml (0.4.2-2) unstable; urgency=low
 
+  * debian/source/options
+    - Add extend-diff-ignore to ignore changes in dexml.egg-info after the
+      build. (Closes: #671100)
+  * debian/rules
+    - Override dh_clean to remove the build directory.
+  * Add debian/source/local-options.
+  * Update debian/rules to build --with both python2 and python3.
+  * Update debian/rules to use consistent options between pyversions and
+    py3versions.
+  * Bump standards version to 3.9.3.
+  * Update copyright format URI in debian/copyright.
   * Add DM-Upload-Allowed control field.
 
- -- Janos Guljas <janos at resenje.org>  Sun, 11 Dec 2011 15:19:44 +0100
+ -- Janos Guljas <janos at resenje.org>  Fri, 04 May 2012 16:44:39 +0200
 
 python-dexml (0.4.2-1) unstable; urgency=low
 

Modified: packages/python-dexml/trunk/debian/control
===================================================================
--- packages/python-dexml/trunk/debian/control	2012-05-04 14:47:33 UTC (rev 21549)
+++ packages/python-dexml/trunk/debian/control	2012-05-04 16:20:49 UTC (rev 21550)
@@ -5,7 +5,7 @@
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.5), python3-all (>= 3.1), python-setuptools, python3-setuptools
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://pypi.python.org/pypi/dexml/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-dexml/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-dexml/trunk/

Modified: packages/python-dexml/trunk/debian/copyright
===================================================================
--- packages/python-dexml/trunk/debian/copyright	2012-05-04 14:47:33 UTC (rev 21549)
+++ packages/python-dexml/trunk/debian/copyright	2012-05-04 16:20:49 UTC (rev 21550)
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: dexml
 Upstream-Contact: Ryan Kelly <ryan at rfk.id.au>
 Source: http://github.com/rfk/dexml
@@ -25,7 +25,7 @@
  THE SOFTWARE.
 
 Files: debian/*
-Copyright: 2011 Janos Guljas <janos at resenje.org>
+Copyright: 2012 Janos Guljas <janos at resenje.org>
 License: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public

Modified: packages/python-dexml/trunk/debian/rules
===================================================================
--- packages/python-dexml/trunk/debian/rules	2012-05-04 14:47:33 UTC (rev 21549)
+++ packages/python-dexml/trunk/debian/rules	2012-05-04 16:20:49 UTC (rev 21550)
@@ -1,14 +1,14 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2,python3
 
 override_dh_auto_install:
 	for pyvers in $(shell pyversions -vr); do \
 		python$$pyvers setup.py install --install-layout=deb \
 			--root $(CURDIR)/debian/python-dexml; \
 	done
-	for pyvers in $(shell py3versions -sv); do \
+	for pyvers in $(shell py3versions -vr); do \
 		python$$pyvers setup.py install --install-layout=deb \
 			--root $(CURDIR)/debian/python3-dexml; \
 	done
@@ -21,6 +21,6 @@
 		python$$pyvers setup.py test; \
 	done
 
-override_dh_python2:
-	dh_python2 -ppython-dexml
-	dh_python3 -ppython3-dexml
+override_dh_clean:
+	dh_clean
+	rm -rf build

Added: packages/python-dexml/trunk/debian/source/local-options
===================================================================
--- packages/python-dexml/trunk/debian/source/local-options	                        (rev 0)
+++ packages/python-dexml/trunk/debian/source/local-options	2012-05-04 16:20:49 UTC (rev 21550)
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes

Added: packages/python-dexml/trunk/debian/source/options
===================================================================
--- packages/python-dexml/trunk/debian/source/options	                        (rev 0)
+++ packages/python-dexml/trunk/debian/source/options	2012-05-04 16:20:49 UTC (rev 21550)
@@ -0,0 +1 @@
+extend-diff-ignore = "^dexml\.egg-info"