[Python-modules-commits] r26403 - in packages/enum34/trunk/debian (6 files)

Tue Nov 5 21:10:58 UTC 2013

Date: Tuesday, November 5, 2013 @ 21:10:56
  Author: barry
Revision: 26403

* New upstream release.
* Switch to pybuild build system.
  - d/rules: Remove everything that pybuild obsoletes.  Also, upstream
    no longer provides an enum34/NEWS.rst file.
  - d/control: Add dh-python to Build-Depend.  Also, wrap-and-sort.
  - d/*.install: Obsoleted by pybuild; removed.
* d/python-enum34.pyremove: Remove the installed LICENSE file (currently
  only works for dh_python2) to avoid the extra-license-file lintian
  warning.
* d/rules: Manually remove the LICENSE file for Python 3.  (FIXME when
  dh_python3 support for d/*.pyremove is enabled).

Modified:
  packages/enum34/trunk/debian/changelog
  packages/enum34/trunk/debian/control
  packages/enum34/trunk/debian/python-enum34.pyremove
  packages/enum34/trunk/debian/rules
Deleted:
  packages/enum34/trunk/debian/python-enum34.install
  packages/enum34/trunk/debian/python3-enum34.install

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

--- packages/enum34/trunk/debian/changelog	2013-11-05 20:20:20 UTC (rev 26402)
+++ packages/enum34/trunk/debian/changelog	2013-11-05 21:10:56 UTC (rev 26403)
@@ -1,3 +1,19 @@
+enum34 (0.9.19-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Switch to pybuild build system.
+    - d/rules: Remove everything that pybuild obsoletes.  Also, upstream
+      no longer provides an enum34/NEWS.rst file.
+    - d/control: Add dh-python to Build-Depend.  Also, wrap-and-sort.
+    - d/*.install: Obsoleted by pybuild; removed.
+  * d/python-enum34.pyremove: Remove the installed LICENSE file (currently
+    only works for dh_python2) to avoid the extra-license-file lintian
+    warning.
+  * d/rules: Manually remove the LICENSE file for Python 3.  (FIXME when
+    dh_python3 support for d/*.pyremove is enabled).
+
+ -- Barry Warsaw <barry at debian.org>  Tue, 05 Nov 2013 11:43:28 -0500
+
 enum34 (0.9.18-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/enum34/trunk/debian/control
===================================================================
--- packages/enum34/trunk/debian/control	2013-11-05 20:20:20 UTC (rev 26402)
+++ packages/enum34/trunk/debian/control	2013-11-05 21:10:56 UTC (rev 26403)
@@ -6,13 +6,14 @@
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2
 Priority: optional
-Build-Depends: python-all (>= 2.6.6-3~),
+Build-Depends: debhelper (>= 8),
+               dh-python,
+               python-all (>= 2.6.6-3~),
+               python-docutils,
                python-setuptools,
                python-sphinx (>= 1.0.7+dfsg-1~),
-               debhelper (>= 8),
                python3-all,
-               python3-setuptools,
-               python-docutils
+               python3-setuptools
 Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/enum34/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/enum34/trunk/
@@ -20,7 +21,7 @@
 Package: python-enum34-doc
 Architecture: all
 Section: doc
-Depends: ${sphinxdoc:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
 Description: backport of Python 3.4's enum package
  PEP 435 adds an enumeration to Python 3.4.  This module provides a
  backport of that data type for older Python versions.  It defines two
@@ -31,8 +32,7 @@
 
 Package: python-enum34
 Architecture: all
-Depends: ${python:Depends},
-         ${misc:Depends}
+Depends: ${misc:Depends}, ${python:Depends}
 Suggests: python-enum34-doc
 Description: backport of Python 3.4's enum package
  PEP 435 adds an enumeration to Python 3.4.  This module provides a
@@ -44,8 +44,7 @@
 
 Package: python3-enum34
 Architecture: all
-Depends: ${python3:Depends},
-         ${misc:Depends}
+Depends: ${misc:Depends}, ${python3:Depends}
 Suggests: python-enum34-doc
 Description: backport of Python 3.4's enum package
  PEP 435 adds an enumeration to Python 3.4.  This module provides a

Deleted: packages/enum34/trunk/debian/python-enum34.install
===================================================================
--- packages/enum34/trunk/debian/python-enum34.install	2013-11-05 20:20:20 UTC (rev 26402)
+++ packages/enum34/trunk/debian/python-enum34.install	2013-11-05 21:10:56 UTC (rev 26403)
@@ -1 +0,0 @@
-usr/lib/python2*

Modified: packages/enum34/trunk/debian/python-enum34.pyremove
===================================================================
--- packages/enum34/trunk/debian/python-enum34.pyremove	2013-11-05 20:20:20 UTC (rev 26402)
+++ packages/enum34/trunk/debian/python-enum34.pyremove	2013-11-05 21:10:56 UTC (rev 26403)
@@ -1 +1,2 @@
 enum34*.egg-info/SOURCES.txt
+*/LICENSE

Deleted: packages/enum34/trunk/debian/python3-enum34.install
===================================================================
--- packages/enum34/trunk/debian/python3-enum34.install	2013-11-05 20:20:20 UTC (rev 26402)
+++ packages/enum34/trunk/debian/python3-enum34.install	2013-11-05 21:10:56 UTC (rev 26403)
@@ -1 +0,0 @@
-usr/lib/python3

Modified: packages/enum34/trunk/debian/rules
===================================================================
--- packages/enum34/trunk/debian/rules	2013-11-05 20:20:20 UTC (rev 26402)
+++ packages/enum34/trunk/debian/rules	2013-11-05 21:10:56 UTC (rev 26403)
@@ -1,43 +1,16 @@
 #!/usr/bin/make -f
 
-PYTHON2=$(shell pyversions -vr)
-PYTHON3=$(shell py3versions -vr)
+export PYBUILD_NAME=enum34
 
 %:
-#	dh $@ --with python2,python3,sphinxdoc
-	dh $@ --with python2,python3
+	dh $@ --with python2,python3 --buildsystem=pybuild
 
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-test-python%:
-	python$* -m unittest discover -vv
-
-override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
-endif
-
-build-python%:
-	python$* setup.py build
-
-override_dh_auto_build: $(PYTHON3:%=build-python%)
-	dh_auto_build
-
-install-python%:
-	python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
-
-override_dh_auto_install: $(PYTHON3:%=install-python%)
+override_dh_auto_install:
+	# Avoid lintian extra-license-file warnings.
 	dh_auto_install
-	rm -f debian/tmp/usr/lib/python2*/dist-packages/enum/py3_enum.py
-	rm -f debian/tmp/usr/lib/python2*/dist-packages/enum/test/py3_test_enum.py
-	rm -f debian/tmp/usr/lib/python3/dist-packages/enum/test/py2_test_enum.py
-	rm -f debian/tmp/usr/lib/python3/dist-packages/enum/py2_enum.py
+	rm -f debian/python3-enum34/usr/lib/python3.*/dist-packages/enum/LICENSE
 
-# override_dh_installchangelogs:
-# 	dh_installchangelogs -k enum34/NEWS.rst
-
 override_dh_installdocs:
+	mkdir -p debian/tmp
 	rst2html enum/doc/enum.rst debian/tmp/enum34.html
 	dh_installdocs
-
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -rf build
-	rm -rf *.egg-info


