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

Mon Aug 18 15:54:22 UTC 2014

Date: Monday, August 18, 2014 @ 15:54:21
  Author: barry
Revision: 30192

* New upstream release.
* d/copyright: Update copyright years.
* d/control:
  - Updated maintainer email address.
  - Updated Build-Depends.
  - Updated Standards-Version with no further changes needed.
  - wrap-and-sort
* d/rules: Port to --buildsystem=pybuild
* d/*.install: Removed.
* d/patches/setup.patch: Removed.
* d/python-flufl.bounce.links: Removed.

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

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

--- packages/flufl.bounce/trunk/debian/changelog	2014-08-18 15:24:06 UTC (rev 30191)
+++ packages/flufl.bounce/trunk/debian/changelog	2014-08-18 15:54:21 UTC (rev 30192)
@@ -1,8 +1,18 @@
-flufl.bounce (2.2.1-2) UNRELEASED; urgency=low
+flufl.bounce (2.3-1) UNRELEASED; urgency=low
 
-  * debian/copyright: Update copyright years.
+  * New upstream release.
+  * d/copyright: Update copyright years.
+  * d/control:
+    - Updated maintainer email address.
+    - Updated Build-Depends.
+    - Updated Standards-Version with no further changes needed.
+    - wrap-and-sort
+  * d/rules: Port to --buildsystem=pybuild
+  * d/*.install: Removed.
+  * d/patches/setup.patch: Removed.
+  * d/python-flufl.bounce.links: Removed.
 
- -- Barry Warsaw <barry at python.org>  Fri, 21 Jun 2013 10:41:15 -0400
+ -- Barry Warsaw <barry at debian.org>  Mon, 18 Aug 2014 11:04:47 -0400
 
 flufl.bounce (2.2.1-1) unstable; urgency=low
 

Modified: packages/flufl.bounce/trunk/debian/control
===================================================================
--- packages/flufl.bounce/trunk/debian/control	2014-08-18 15:24:06 UTC (rev 30191)
+++ packages/flufl.bounce/trunk/debian/control	2014-08-18 15:54:21 UTC (rev 30192)
@@ -1,24 +1,25 @@
 Source: flufl.bounce
-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.bounce
 Section: python
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2
 Priority: optional
-Build-Depends: python-all (>= 2.6.6-3~),
-               python-setuptools,
+Build-Depends: debhelper (>= 8),
+               dh-python,
+               python-all (>= 2.6.6-3~),
+               python-enum34,
                python-pkg-resources,
+               python-setuptools,
                python-sphinx (>= 1.0.7+dfsg-1~),
-               python-flufl.enum,
                python-zope.interface,
-               debhelper (>= 8),
                python3-all,
-               python3-setuptools,
+               python3-enum34,
                python3-pkg-resources,
-               python3-flufl.enum,
+               python3-setuptools,
                python3-zope.interface
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/flufl.bounce/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/flufl.bounce/trunk/
 
@@ -27,7 +28,7 @@
 Section: doc
 Breaks: python-flufl.bounce-docs
 Replaces: python-flufl.bounce-docs
-Depends: ${sphinxdoc:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
 Description: email bounce detectors (common documentation)
  This library provides a set of heuristics and an API for detecting the
  original bouncing email addresses from a bounce message.  Many formats found
@@ -37,9 +38,7 @@
 
 Package: python-flufl.bounce
 Architecture: all
-Depends: ${python:Depends},
-         ${misc:Depends},
-         python-pkg-resources
+Depends: python-pkg-resources, ${misc:Depends}, ${python:Depends}
 Suggests: python-flufl.bounce-doc
 Description: email bounce detectors (Python 2)
  This library provides a set of heuristics and an API for detecting the
@@ -48,9 +47,7 @@
 
 Package: python3-flufl.bounce
 Architecture: all
-Depends: ${python3:Depends},
-         ${misc:Depends},
-         python3-pkg-resources
+Depends: python3-pkg-resources, ${misc:Depends}, ${python3:Depends}
 Suggests: python-flufl.bounce-doc
 Description: email bounce detectors (Python 3)
  This library provides a set of heuristics and an API for detecting the

Modified: packages/flufl.bounce/trunk/debian/patches/series
===================================================================
--- packages/flufl.bounce/trunk/debian/patches/series	2014-08-18 15:24:06 UTC (rev 30191)
+++ packages/flufl.bounce/trunk/debian/patches/series	2014-08-18 15:54:21 UTC (rev 30192)
@@ -1 +0,0 @@
-setup.patch

Modified: packages/flufl.bounce/trunk/debian/patches/setup.patch
===================================================================
--- packages/flufl.bounce/trunk/debian/patches/setup.patch	2014-08-18 15:24:06 UTC (rev 30191)
+++ packages/flufl.bounce/trunk/debian/patches/setup.patch	2014-08-18 15:54:21 UTC (rev 30192)
@@ -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-04 16:39:36 +0000
-+++ b/setup.py	2012-01-27 00:26:48 +0000
-@@ -15,8 +15,8 @@
- # You should have received a copy of the GNU Lesser General Public License
- # along with flufl.bounce.  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, find_doctests, get_version, long_description, require_python)
-

Modified: packages/flufl.bounce/trunk/debian/python-flufl.bounce.install
===================================================================
--- packages/flufl.bounce/trunk/debian/python-flufl.bounce.install	2014-08-18 15:24:06 UTC (rev 30191)
+++ packages/flufl.bounce/trunk/debian/python-flufl.bounce.install	2014-08-18 15:54:21 UTC (rev 30192)
@@ -1 +0,0 @@
-usr/lib/python2*

Modified: packages/flufl.bounce/trunk/debian/python-flufl.bounce.links
===================================================================
--- packages/flufl.bounce/trunk/debian/python-flufl.bounce.links	2014-08-18 15:24:06 UTC (rev 30191)
+++ packages/flufl.bounce/trunk/debian/python-flufl.bounce.links	2014-08-18 15:54:21 UTC (rev 30192)
@@ -1 +0,0 @@
-usr/share/doc/python-flufl.bounce/html/_sources usr/share/doc/python-flufl.bounce/rst

Modified: packages/flufl.bounce/trunk/debian/python3-flufl.bounce.install
===================================================================
--- packages/flufl.bounce/trunk/debian/python3-flufl.bounce.install	2014-08-18 15:24:06 UTC (rev 30191)
+++ packages/flufl.bounce/trunk/debian/python3-flufl.bounce.install	2014-08-18 15:54:21 UTC (rev 30192)
@@ -1 +0,0 @@
-usr/lib/python3

Modified: packages/flufl.bounce/trunk/debian/rules
===================================================================
--- packages/flufl.bounce/trunk/debian/rules	2014-08-18 15:24:06 UTC (rev 30191)
+++ packages/flufl.bounce/trunk/debian/rules	2014-08-18 15:54:21 UTC (rev 30192)
@@ -1,38 +1,13 @@
 #!/usr/bin/make -f
 
-PYTHON2=$(shell pyversions -vr)
-PYTHON3=$(shell py3versions -vr)
+export PYBUILD_NAME=flufl.bounce
 
 %:
-	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/bounce/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


