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

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

    Date: Friday, January 27, 2012 @ 00:55:02
  Author: warsaw-guest
Revision: 20148

- add additional python3 build-deps
- bump python-flufl.lock-docs to a Suggests
- add setup.py patch to disable distribute_setup

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

Modified: packages/flufl.lock/trunk/debian/changelog
===================================================================
--- packages/flufl.lock/trunk/debian/changelog	2012-01-27 00:46:33 UTC (rev 20147)
+++ packages/flufl.lock/trunk/debian/changelog	2012-01-27 00:55:02 UTC (rev 20148)
@@ -1,7 +1,7 @@
 flufl.lock (2.2-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>  Fri, 20 Jan 2012 09:20:10 -0500

Modified: packages/flufl.lock/trunk/debian/control
===================================================================
--- packages/flufl.lock/trunk/debian/control	2012-01-27 00:46:33 UTC (rev 20147)
+++ packages/flufl.lock/trunk/debian/control	2012-01-27 00:55:02 UTC (rev 20148)
@@ -8,10 +8,12 @@
 Priority: optional
 Build-Depends: python-all (>= 2.6.6-3~),
                python-setuptools,
+               python-pkg-resources,
                python-sphinx (>= 1.0.7+dfsg-1~),
                debhelper (>= 8),
                python3-all,
-               python3-setuptools
+               python3-setuptools,
+               python3-pkg-resources
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/flufl.lock/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/flufl.lock/trunk/
@@ -28,14 +30,16 @@
 
 Package: python-flufl.lock
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-flufl.lock-docs
+Depends: ${python:Depends}, ${misc:Depends}
+Suggests: python-flufl.lock-docs
 Description: NFS-safe file-based lock with timeouts (Python 2)
  This package provides an NFS-safe file-based locking algorithm influenced 
  by the GNU/Linux open(2) manpage, under the  description of the O_EXCL option.
 
 Package: python3-flufl.lock
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-flufl.lock-docs
+Depends: ${python:Depends}, ${misc:Depends}
+Suggests: python-flufl.lock-docs
 Description: NFS-safe file-based lock with timeouts (Python 3)
  This package provides an NFS-safe file-based locking algorithm influenced 
  by the GNU/Linux open(2) manpage, under the  description of the O_EXCL option.

Added: packages/flufl.lock/trunk/debian/patches/series
===================================================================
--- packages/flufl.lock/trunk/debian/patches/series	                        (rev 0)
+++ packages/flufl.lock/trunk/debian/patches/series	2012-01-27 00:55:02 UTC (rev 20148)
@@ -0,0 +1 @@
+setup.patch

Added: packages/flufl.lock/trunk/debian/patches/setup.patch
===================================================================
--- packages/flufl.lock/trunk/debian/patches/setup.patch	                        (rev 0)
+++ packages/flufl.lock/trunk/debian/patches/setup.patch	2012-01-27 00:55:02 UTC (rev 20148)
@@ -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-20 02:11:22 +0000
++++ b/setup.py	2012-01-27 00:47:41 +0000
+@@ -15,8 +15,8 @@
+ # You should have received a copy of the GNU Lesser General Public License
+ # along with flufl.lock.  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)
+