[Python-modules-commits] r29299 - in packages/flufl.enum/trunk/debian (8 files)

Wed Jun 11 18:56:13 UTC 2014

Date: Wednesday, June 11, 2014 @ 18:56:12
  Author: barry
Revision: 29299

* New upstream release.
* d/control:
  - Add dh-python to Build-Depends.
  - Bump Standards-Version to 3.9.5 with no other changes necessary.
  - wrap-and-sort
* d/rules: Convert to pybuild buildsystem, and simplify.
* d/copyright: Update my email address.
* d/patches/setup.patch: Removed; obsolete.
* d/python{,3}-flufl.enum.install: Removed.

Modified:
  packages/flufl.enum/trunk/debian/changelog
  packages/flufl.enum/trunk/debian/control
  packages/flufl.enum/trunk/debian/copyright
  packages/flufl.enum/trunk/debian/patches/series
  packages/flufl.enum/trunk/debian/patches/setup.patch
  packages/flufl.enum/trunk/debian/python-flufl.enum.install
  packages/flufl.enum/trunk/debian/python3-flufl.enum.install
  packages/flufl.enum/trunk/debian/rules

Modified: packages/flufl.enum/trunk/debian/changelog
===================================================================

--- packages/flufl.enum/trunk/debian/changelog	2014-06-11 15:36:24 UTC (rev 29298)
+++ packages/flufl.enum/trunk/debian/changelog	2014-06-11 18:56:12 UTC (rev 29299)
@@ -1,11 +1,23 @@
-flufl.enum (3.3.2-2) UNRELEASED; urgency=low
+flufl.enum (4.0.1-1) UNRELEASED; urgency=low
 
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
   * Remove DM-Upload-Allowed; it's no longer used by the archive
     software.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 18:40:48 +0200
+  [ Barry Warsaw ]
+  * New upstream release.
+  * d/control:
+    - Add dh-python to Build-Depends.
+    - Bump Standards-Version to 3.9.5 with no other changes necessary.
+    - wrap-and-sort
+  * d/rules: Convert to pybuild buildsystem, and simplify.
+  * d/copyright: Update my email address.
+  * d/patches/setup.patch: Removed; obsolete.
+  * d/python{,3}-flufl.enum.install: Removed.
 
+ -- Barry Warsaw <barry at debian.org>  Wed, 11 Jun 2014 12:12:28 -0400
+
 flufl.enum (3.3.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/flufl.enum/trunk/debian/control
===================================================================
--- packages/flufl.enum/trunk/debian/control	2014-06-11 15:36:24 UTC (rev 29298)
+++ packages/flufl.enum/trunk/debian/control	2014-06-11 18:56:12 UTC (rev 29299)
@@ -1,20 +1,21 @@
 Source: flufl.enum
-Maintainer: Barry Warsaw <barry at python.org>
+Maintainer: Barry Warsaw <barry at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Homepage: http://launchpad.net/flufl.enum
 Section: python
 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-pkg-resources,
                python-setuptools,
-               python-pkg-resources,
                python-sphinx (>= 1.0.7+dfsg-1~),
-               debhelper (>= 8),
                python3-all,
-               python3-setuptools,
-               python3-pkg-resources
-Standards-Version: 3.9.3
+               python3-pkg-resources,
+               python3-setuptools
+Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/flufl.enum/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/flufl.enum/trunk/
 
@@ -23,7 +24,7 @@
 Section: doc
 Breaks: python-flufl.enum-docs
 Replaces: python-flufl.enum-docs
-Depends: ${sphinxdoc:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
 Description: yet another Python enumeration package (common documentation)
  This package provides a Python enumeration, with an emphasis on simple,
  specific, concise semantics in an easy to read and write syntax.
@@ -34,7 +35,7 @@
 
 Package: python-flufl.enum
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python:Depends}
 Suggests: python-flufl.enum-doc
 Description: yet another Python enumeration package (Python 2)
  This package provides a Python enumeration, with an emphasis on simple,
@@ -44,7 +45,7 @@
 
 Package: python3-flufl.enum
 Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python3:Depends}
 Suggests: python-flufl.enum-doc
 Description: yet another Python enumeration package (Python 3)
  This package provides a Python enumeration, with an emphasis on simple,

Modified: packages/flufl.enum/trunk/debian/copyright
===================================================================
--- packages/flufl.enum/trunk/debian/copyright	2014-06-11 15:36:24 UTC (rev 29298)
+++ packages/flufl.enum/trunk/debian/copyright	2014-06-11 18:56:12 UTC (rev 29299)
@@ -1,6 +1,6 @@
 This work was packaged for Debian by:
 
-    Barry A. Warsaw <barry at python.org> on 2010-11-03
+    Barry A. Warsaw <barry at debian.org> on 2010-11-03
 
 It was downloaded from:
 
@@ -34,7 +34,7 @@
 
 The Debian packaging is:
 
-    Copyright (C) 2010 Barry A. Warsaw <barry at python.org>
+    Copyright (C) 2010 Barry A. Warsaw <barry at debian.org>
 
 and is licensed under the LGPL version 3,
 see "/usr/share/common-licenses/LGPL-3".

Modified: packages/flufl.enum/trunk/debian/patches/series
===================================================================
--- packages/flufl.enum/trunk/debian/patches/series	2014-06-11 15:36:24 UTC (rev 29298)
+++ packages/flufl.enum/trunk/debian/patches/series	2014-06-11 18:56:12 UTC (rev 29299)
@@ -1 +0,0 @@
-setup.patch

Modified: packages/flufl.enum/trunk/debian/patches/setup.patch
===================================================================
--- packages/flufl.enum/trunk/debian/patches/setup.patch	2014-06-11 15:36:24 UTC (rev 29298)
+++ packages/flufl.enum/trunk/debian/patches/setup.patch	2014-06-11 18:56:12 UTC (rev 29299)
@@ -1,20 +0,0 @@
-Description: Comment out distribute_setup since this could lead to the
- downloading of distribute from PyPI.
-Author: Barry Warsaw <barry at python.org>
-Forwarded: not-needed
-
-=== modified file 'setup.py'
---- a/setup.py	2012-01-19 15:52:02 +0000
-+++ b/setup.py	2012-01-26 21:11:17 +0000
-@@ -15,8 +15,8 @@
- # You should have received a copy of the GNU Lesser General Public License
- # along with flufl.enum.  If not, see <http://www.gnu.org/licenses/>.
- 
--import distribute_setup
--distribute_setup.use_setuptools()
-+## import distribute_setup
-+## distribute_setup.use_setuptools()
- 
- from setup_helpers import (
-     description, get_version, long_description, require_python)
-

Modified: packages/flufl.enum/trunk/debian/python-flufl.enum.install
===================================================================
--- packages/flufl.enum/trunk/debian/python-flufl.enum.install	2014-06-11 15:36:24 UTC (rev 29298)
+++ packages/flufl.enum/trunk/debian/python-flufl.enum.install	2014-06-11 18:56:12 UTC (rev 29299)
@@ -1 +0,0 @@
-usr/lib/python2*

Modified: packages/flufl.enum/trunk/debian/python3-flufl.enum.install
===================================================================
--- packages/flufl.enum/trunk/debian/python3-flufl.enum.install	2014-06-11 15:36:24 UTC (rev 29298)
+++ packages/flufl.enum/trunk/debian/python3-flufl.enum.install	2014-06-11 18:56:12 UTC (rev 29299)
@@ -1 +0,0 @@
-usr/lib/python3

Modified: packages/flufl.enum/trunk/debian/rules
===================================================================
--- packages/flufl.enum/trunk/debian/rules	2014-06-11 15:36:24 UTC (rev 29298)
+++ packages/flufl.enum/trunk/debian/rules	2014-06-11 18:56:12 UTC (rev 29299)
@@ -1,40 +1,14 @@
 #!/usr/bin/make -f
 
 #DH_VERBOSE=1
+export PYBUILD_NAME=flufl.enum
 
-PYTHON2=$(shell pyversions -vr)
-PYTHON3=$(shell py3versions -vr)
-
 %:
-	dh $@ --with python2,python3,sphinxdoc
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-test-python%:
-	python$* setup.py test -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%)
-	dh_auto_install
-
 override_dh_installchangelogs:
 	dh_installchangelogs -k flufl/enum/NEWS.rst
 
 override_dh_installdocs:
 	python setup.py build_sphinx
 	dh_installdocs build/sphinx/html
-
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -rf build
-	rm -rf *.egg-info


