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

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

    Date: Friday, January 27, 2012 @ 00:37:42
  Author: warsaw-guest
Revision: 20146

- bump python-flufl.bounce-docs to a Suggests
- add python*-pkg-resources as a build-dep
- add setup.py patch to disable distribute_setup

Added:
  packages/flufl.bounce/trunk/debian/patches/
  packages/flufl.bounce/trunk/debian/patches/series
  packages/flufl.bounce/trunk/debian/patches/setup.patch
Modified:
  packages/flufl.bounce/trunk/debian/changelog
  packages/flufl.bounce/trunk/debian/control

Modified: packages/flufl.bounce/trunk/debian/changelog
===================================================================
--- packages/flufl.bounce/trunk/debian/changelog	2012-01-26 23:15:39 UTC (rev 20145)
+++ packages/flufl.bounce/trunk/debian/changelog	2012-01-27 00:37:42 UTC (rev 20146)
@@ -1,7 +1,7 @@
 flufl.bounce (2.1-1) unstable; urgency=low
 
   * New upstream release.
-  * Also build for Python 3.
+  * Build for Python 3, and split out common documentation package.
   * compat level 8
 
  -- Barry Warsaw <barry at python.org>  Thu, 19 Jan 2012 20:15:23 -0500

Modified: packages/flufl.bounce/trunk/debian/control
===================================================================
--- packages/flufl.bounce/trunk/debian/control	2012-01-26 23:15:39 UTC (rev 20145)
+++ packages/flufl.bounce/trunk/debian/control	2012-01-27 00:37:42 UTC (rev 20146)
@@ -8,12 +8,14 @@
 Priority: optional
 Build-Depends: python-all (>= 2.6.6-3~),
                python-setuptools,
+               python-pkg-resources,
                python-sphinx (>= 1.0.7+dfsg-1~),
                python-flufl.enum,
                python-zope.interface,
                debhelper (>= 8),
                python3-all,
                python3-setuptools,
+               python3-pkg-resources,
                python3-flufl.enum,
                python3-zope.interface
 Standards-Version: 3.9.2
@@ -35,8 +37,8 @@
 Architecture: all
 Depends: ${python:Depends},
          ${misc:Depends},
-         python-flufl.bounce-docs,
          python-pkg-resources
+Suggests: python-flufl.bounce-docs
 Description: email bounce detectors (Python 2)
  This library provides a set of heuristics and an API for detecting the
  original bouncing email addresses from a bounce message.  Many formats found
@@ -46,8 +48,8 @@
 Architecture: all
 Depends: ${python3:Depends},
          ${misc:Depends},
-         python-flufl.bounce-docs,
          python3-pkg-resources
+Suggests: python-flufl.bounce-docs
 Description: email bounce detectors (Python 3)
  This library provides a set of heuristics and an API for detecting the
  original bouncing email addresses from a bounce message.  Many formats found

Added: packages/flufl.bounce/trunk/debian/patches/series
===================================================================
--- packages/flufl.bounce/trunk/debian/patches/series	                        (rev 0)
+++ packages/flufl.bounce/trunk/debian/patches/series	2012-01-27 00:37:42 UTC (rev 20146)
@@ -0,0 +1 @@
+setup.patch

Added: packages/flufl.bounce/trunk/debian/patches/setup.patch
===================================================================
--- packages/flufl.bounce/trunk/debian/patches/setup.patch	                        (rev 0)
+++ packages/flufl.bounce/trunk/debian/patches/setup.patch	2012-01-27 00:37:42 UTC (rev 20146)
@@ -0,0 +1,20 @@
+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)
+