[Python-modules-commits] r15721 - in packages/python-eventlet/trunk/debian (16 files)

stefanor at users.alioth.debian.org stefanor at users.alioth.debian.org
Tue Feb 15 14:10:30 UTC 2011


    Date: Tuesday, February 15, 2011 @ 14:10:15
  Author: stefanor
Revision: 15721

* Initial release in Debian. (Closes: #532140)
  - Maintainer is Debian Python Modules team.
  - Add myself and Monty to Uploaders.
  - Add Vcs entries.
* Change architecture to all, this is a pure-Python module.
  - Build-Depend on python-all.
* Bump debhelper compat and Build-Depend to 8.
* Drop unnecessary article from Description.
* Switch to dh_python2.
  - Drop pycompat, deprecated.
  - Use X-Python-Version instead of pyversions. Bump python-all Build-Depend
    to 2.6.5-13~.
  - Breaks: ${python:Breaks}.
  - Let dh_python2 determine Python dependencies.
* Run test suite during build.
  - Add Build-Depends on python-httplib2, python-nose, python-openssl and
    python-zmq.
  - disable-psycopg-patcher-test.patch: Use the postgres_requirement
    function from tests.db_pool_test in tests.patcher_psycopg_test, to skip
    unless Postgres is available.
* Build Sphinx documentation.
  - Drop doc/modules/zmq.rst, it isn't used and requires Sphinx 1.0.
* Include README.twisted.
* Use python-mock instead of bundled module.
* Update copyright to the latest format, and rework to group by licence.
  Include all BSD variants present.

Added:
  packages/python-eventlet/trunk/debian/doc-base
  packages/python-eventlet/trunk/debian/links
  packages/python-eventlet/trunk/debian/patches/disable-psycopg-patcher-test.patch
  packages/python-eventlet/trunk/debian/source/local-options
Modified:
  packages/python-eventlet/trunk/debian/changelog
  packages/python-eventlet/trunk/debian/compat
  packages/python-eventlet/trunk/debian/control
  packages/python-eventlet/trunk/debian/copyright
  packages/python-eventlet/trunk/debian/docs
  packages/python-eventlet/trunk/debian/patches/series
  packages/python-eventlet/trunk/debian/patches/wrap-greenpipe.patch
  packages/python-eventlet/trunk/debian/rules
  packages/python-eventlet/trunk/debian/watch
Deleted:
  packages/python-eventlet/trunk/debian/postinst
  packages/python-eventlet/trunk/debian/pycompat
  packages/python-eventlet/trunk/debian/pyversions

Modified: packages/python-eventlet/trunk/debian/changelog
===================================================================
--- packages/python-eventlet/trunk/debian/changelog	2011-02-15 10:37:32 UTC (rev 15720)
+++ packages/python-eventlet/trunk/debian/changelog	2011-02-15 14:10:15 UTC (rev 15721)
@@ -1,6 +1,37 @@
+python-eventlet (0.9.14-1) UNRELEASED; urgency=low
+
+  * Initial release in Debian. (Closes: #532140)
+    - Maintainer is Debian Python Modules team.
+    - Add myself and Monty to Uploaders.
+    - Add Vcs entries.
+  * Change architecture to all, this is a pure-Python module.
+    - Build-Depend on python-all.
+  * Bump debhelper compat and Build-Depend to 8.
+  * Drop unnecessary article from Description.
+  * Switch to dh_python2.
+    - Drop pycompat, deprecated.
+    - Use X-Python-Version instead of pyversions. Bump python-all Build-Depend
+      to 2.6.5-13~.
+    - Breaks: ${python:Breaks}.
+    - Let dh_python2 determine Python dependencies.
+  * Run test suite during build.
+    - Add Build-Depends on python-httplib2, python-nose, python-openssl and
+      python-zmq.
+    - disable-psycopg-patcher-test.patch: Use the postgres_requirement
+      function from tests.db_pool_test in tests.patcher_psycopg_test, to skip
+      unless Postgres is available.
+  * Build Sphinx documentation.
+    - Drop doc/modules/zmq.rst, it isn't used and requires Sphinx 1.0.
+  * Include README.twisted.
+  * Use python-mock instead of bundled module.
+  * Update copyright to the latest format, and rework to group by licence.
+    Include all BSD variants present.
+
+ -- Stefano Rivera <stefanor at debian.org>  Mon, 14 Feb 2011 19:52:58 +0200
+
 python-eventlet (0.9.14-0ubuntu2) natty; urgency=low
 
-  * Clean up left over .pyc files. 
+  * Clean up left over .pyc files.
 
  -- Soren Hansen <soren at ubuntu.com>  Mon, 14 Feb 2011 15:18:58 +0100
 
@@ -36,4 +67,3 @@
   * Initial upload to Ubuntu. (FFe: LP: #620368)
 
  -- Soren Hansen <soren at ubuntu.com>  Mon, 23 Aug 2010 08:54:30 +0200
-

Modified: packages/python-eventlet/trunk/debian/compat
===================================================================
--- packages/python-eventlet/trunk/debian/compat	2011-02-15 10:37:32 UTC (rev 15720)
+++ packages/python-eventlet/trunk/debian/compat	2011-02-15 14:10:15 UTC (rev 15721)
@@ -1 +1 @@
-7
+8

Modified: packages/python-eventlet/trunk/debian/control
===================================================================
--- packages/python-eventlet/trunk/debian/control	2011-02-15 10:37:32 UTC (rev 15720)
+++ packages/python-eventlet/trunk/debian/control	2011-02-15 14:10:15 UTC (rev 15721)
@@ -1,20 +1,32 @@
 Source: python-eventlet
 Section: python
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
-XSBC-Original-Maintainer: Monty Taylor <mordred at inaugust.com>
-Build-Depends: debhelper (>= 7),
- python-all-dev (>= 2.5),
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders:
+ Stefano Rivera <stefanor at debian.org>,
+ Monty Taylor <mordred at inaugust.com>
+Build-Depends:
+ debhelper (>= 8),
+ python-all (>= 2.6.5-13~),
+ python-greenlet,
+ python-httplib2,
+ python-nose,
+ python-mock,
+ python-openssl,
  python-setuptools,
- python-support
+ python-sphinx,
+ python-zmq
+X-Python-Version: >= 2.5
 Standards-Version: 3.9.1
 Homepage: http://eventlet.net
+Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-eventlet/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-eventlet/trunk/
 
 Package: python-eventlet
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-greenlet
-Provides: ${python:Provides}
-Description: A concurrent networking library for Python
+Architecture: all
+Depends: libjs-jquery, ${misc:Depends}, ${python:Depends}
+Breaks: ${python:Breaks}
+Description: concurrent networking library for Python
  Eventlet allows you to change how you run your code, not how you write it.
  .
  It uses epoll or libevent for highly scalable non-blocking I/O.

Modified: packages/python-eventlet/trunk/debian/copyright
===================================================================
--- packages/python-eventlet/trunk/debian/copyright	2011-02-15 10:37:32 UTC (rev 15720)
+++ packages/python-eventlet/trunk/debian/copyright	2011-02-15 14:10:15 UTC (rev 15721)
@@ -1,70 +1,130 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Debianized-By: Monty Taylor <mordred at inaugust.com>
-Debianized-Date: Tue, 13 Jul 2010 14:21:05 -0500
-Original-Source: http://eventlet.net
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Upstream-Name: Eventlet
+Upstream-Contact: Ryan Williams <breath at alum.mit.edu>
+Source: http://eventlet.net
 
-Files: eventlet/tpool.py
-Files: tests/tpool_test.py
-Copyright: Copyright (c) 2007-2009, Linden Research, Inc.
-Copyright: Copyright (c) 2007, IBM Corp.
+Files: *
+Copyright:
+ 2005-2006, Bob Ippolito
+ 2010,      Daniele Varrazzo <daniele.varrazzo at gmail.com>
+ 2009-2010, Denis Bilenko, denis.bilenko at gmail com
+ 2007-2010, Linden Research, Inc.
+ 2008-2010, Eventlet Contributors
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
+Files: eventlet/tpool.py tests/tpool_test.py
+Copyright:
+ 2007-2009, Linden Research, Inc.
+ 2007,      IBM Corp.
 License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ use this file except in compliance with the License.
+ .
+ On Debian GNU/Linux systems, the complete text of the Apache License v2 can be
+ found in `/usr/share/common-licenses/Apache-2.0'.
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ License for the specific language governing permissions and limitations under
+ the License.
 
-Files: eventlet/queue.py
-Copyright: Copyright (c) 2009 Denis Bilenko, denis.bilenko at gmail com
-Copyright: Copyright (c) 2010 Eventlet Contributors (see AUTHORS)
-License: MIT
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  .
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  .
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-
-Files: eventlet/timeout.py
-Copyright: Copyright (c) 2009-2010 Denis Bilenko, denis.bilenko at gmail com
-Copyright: Copyright (c) 2010 Eventlet Contributors (see AUTHORS)
-License: MIT
-
-Files: eventlet/support/psycopg2_patcher.py
-Copyright: Copyright (C) 2010 Daniele Varrazzo <daniele.varrazzo at gmail.com>
-License: MIT
-
 Files: eventlet/support/greendns.py
-Copyright: Copyright (c) 2005-2010 Slide, Inc.
-License: BSD
+Copyright: 2005-2010, Slide, Inc.
+License: generic-bsd
 
 Files: eventlet/green/profile.py
-Copyright: Copyright (c) 2010, CCP Games
-License: BSD
+Copyright: 2010, CCP Games
+License: ccp-bsd
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+ * Neither the name of CCP Games nor the names of its contributors may be used
+   to endorse or promote products derived from this software without specific
+   prior written permission.
+ THIS SOFTWARE IS PROVIDED BY CCP GAMES ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL CCP GAMES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
 
 Files: tests/mock.py
-Copyright: Copyright (C) 2007-2009 Michael Foord
-License: BSD
+Copyright: 2007-2009, Michael Foord
+Comment: Deleted during build, and Debian's python-mock package is used
+ instead.
+License: voidspace-bsd
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+ * Neither the name of Michael Foord nor the name of Voidspace may be used to
+   endorse or promote products derived from this software without specific
+   prior written permission.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: debian/*
-Copyright: Copyright (C) 2010, Monty Taylor
-License: BSD
+Copyright:
+ 2010,      Monty Taylor <mordred at inaugust.com>
+ 2010-2011, Soren Hansen <soren at ubuntu.com>
+ 2011,      Stefano Rivera <stefanor at debian.org>
+License: generic-bsd
 
-Files: *
-Copyright: Copyright (c) 2005-2006, Bob Ippolito
-Copyright: Copyright (c) 2007-2010, Linden Research, Inc.
-Copyright: Copyright (c) 2008-2010, Eventlet Contributors (see AUTHORS)
-License: MIT
-
-On Debian GNU/Linux systems, the complete text of the Apache License
-v2 can be found in `/usr/share/common-licenses/Apache-2.0'.
-
-On Debian GNU/Linux systems, the complete text of the BSD License
-can be found in `/usr/share/common-licenses/BSD'.
-
+License: generic-bsd
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+ * Neither the name of the author nor the names of other contributors may be
+   used to endorse or promote products derived from this software without
+   specific prior written permission.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Added: packages/python-eventlet/trunk/debian/doc-base
===================================================================
--- packages/python-eventlet/trunk/debian/doc-base	                        (rev 0)
+++ packages/python-eventlet/trunk/debian/doc-base	2011-02-15 14:10:15 UTC (rev 15721)
@@ -0,0 +1,12 @@
+Document: eventlet
+Title: Eventlet Documentation
+Author: The Eventlet Contributors
+Abstract: concurrent networking library for Python
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-eventlet/html/index.html
+Files: /usr/share/doc/python-eventlet/html/*.html
+
+Format: Text
+Files: /usr/share/doc/python-eventlet/rst/index.txt

Modified: packages/python-eventlet/trunk/debian/docs
===================================================================
--- packages/python-eventlet/trunk/debian/docs	2011-02-15 10:37:32 UTC (rev 15720)
+++ packages/python-eventlet/trunk/debian/docs	2011-02-15 14:10:15 UTC (rev 15721)
@@ -1 +1,3 @@
 README
+README.twisted
+doc/_build/html

Added: packages/python-eventlet/trunk/debian/links
===================================================================
--- packages/python-eventlet/trunk/debian/links	                        (rev 0)
+++ packages/python-eventlet/trunk/debian/links	2011-02-15 14:10:15 UTC (rev 15721)
@@ -0,0 +1,2 @@
+/usr/share/javascript/jquery/jquery.js       /usr/share/doc/python-eventlet/html/_static/jquery.js
+/usr/share/doc/python-eventlet/html/_sources /usr/share/doc/python-eventlet/rst

Added: packages/python-eventlet/trunk/debian/patches/disable-psycopg-patcher-test.patch
===================================================================
--- packages/python-eventlet/trunk/debian/patches/disable-psycopg-patcher-test.patch	                        (rev 0)
+++ packages/python-eventlet/trunk/debian/patches/disable-psycopg-patcher-test.patch	2011-02-15 14:10:15 UTC (rev 15721)
@@ -0,0 +1,25 @@
+Description: Use the postgres_requirement function from tests.db_pool_test in
+ tests.patcher_psycopg_test, to skip unless Postgres is available.
+Author: Stefano Rivera <stefanor at debian.org>
+Forwarded: no
+Last-Update: 2011-02-15
+--- a/tests/patcher_psycopg_test.py
++++ b/tests/patcher_psycopg_test.py
+@@ -1,7 +1,8 @@
+ import os
+ 
+-from tests import patcher_test
++from tests import patcher_test, skip_unless
+ from tests import get_database_auth
++from tests.db_pool_test import postgres_requirement
+ 
+ psycopg_test_file = """
+ import os
+@@ -35,6 +36,7 @@
+ """
+ 
+ class PatchingPsycopg(patcher_test.ProcessBase):
++    @skip_unless(postgres_requirement)
+     def test_psycopg_patched(self):
+         if 'PSYCOPG_TEST_DSN' not in os.environ:
+             # construct a non-json dsn for the subprocess

Modified: packages/python-eventlet/trunk/debian/patches/series
===================================================================
--- packages/python-eventlet/trunk/debian/patches/series	2011-02-15 10:37:32 UTC (rev 15720)
+++ packages/python-eventlet/trunk/debian/patches/series	2011-02-15 14:10:15 UTC (rev 15721)
@@ -1 +1,2 @@
 wrap-greenpipe.patch
+disable-psycopg-patcher-test.patch

Modified: packages/python-eventlet/trunk/debian/patches/wrap-greenpipe.patch
===================================================================
--- packages/python-eventlet/trunk/debian/patches/wrap-greenpipe.patch	2011-02-15 10:37:32 UTC (rev 15720)
+++ packages/python-eventlet/trunk/debian/patches/wrap-greenpipe.patch	2011-02-15 14:10:15 UTC (rev 15721)
@@ -3,11 +3,8 @@
 Forwarded: https://bitbucket.org/which_linden/eventlet/issue/77/subprocess-module-fails-if-os-module-is
 Last-Update: 2011-02-14
 
-
-Index: python-eventlet-0.9.14/eventlet/green/subprocess.py
-===================================================================
---- python-eventlet-0.9.14.orig/eventlet/green/subprocess.py	2011-02-14 11:31:39.917609581 +0100
-+++ python-eventlet-0.9.14/eventlet/green/subprocess.py	2011-02-14 11:31:45.767618158 +0100
+--- a/eventlet/green/subprocess.py
++++ b/eventlet/green/subprocess.py
 @@ -27,7 +27,7 @@
              # eventlet.processes.Process.run() method.
              for attr in "stdin", "stdout", "stderr":

Deleted: packages/python-eventlet/trunk/debian/postinst
===================================================================
--- packages/python-eventlet/trunk/debian/postinst	2011-02-15 10:37:32 UTC (rev 15720)
+++ packages/python-eventlet/trunk/debian/postinst	2011-02-15 14:10:15 UTC (rev 15721)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "configure" ]
-then
-	# We need a bit of manual cleanup due to toolchain problems around
-    # the time when python2.7 was # made the default
-	if dpkg --compare-versions "$2" le 0.9.14-0ubuntu2~~ && \
-	   dpkg --compare-versions "$2" gt 0.9.13-0ubuntu1~
-	then
-		find /usr/lib/python2.7/dist-packages/eventlet -name '*.pyc' -delete || true
-		find /usr/lib/python2.7/dist-packages/eventlet -type d | sort -r | while read d; do rmdir "$d" || true; done
-	fi
-fi
-
-#DEBHELPER#

Deleted: packages/python-eventlet/trunk/debian/pycompat
===================================================================
--- packages/python-eventlet/trunk/debian/pycompat	2011-02-15 10:37:32 UTC (rev 15720)
+++ packages/python-eventlet/trunk/debian/pycompat	2011-02-15 14:10:15 UTC (rev 15721)
@@ -1 +0,0 @@
-2

Deleted: packages/python-eventlet/trunk/debian/pyversions
===================================================================
--- packages/python-eventlet/trunk/debian/pyversions	2011-02-15 10:37:32 UTC (rev 15720)
+++ packages/python-eventlet/trunk/debian/pyversions	2011-02-15 14:10:15 UTC (rev 15721)
@@ -1 +0,0 @@
-2.5-

Modified: packages/python-eventlet/trunk/debian/rules
===================================================================
--- packages/python-eventlet/trunk/debian/rules	2011-02-15 10:37:32 UTC (rev 15720)
+++ packages/python-eventlet/trunk/debian/rules	2011-02-15 14:10:15 UTC (rev 15721)
@@ -1,8 +1,33 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh $@ --with python2
 
-clean:
-	dh clean
-	find . -name "*\.pyc" -delete
+override_dh_auto_build:
+	/bin/echo -e '# On Debian, we use the packaged mock\n'\
+	'from __future__ import absolute_import\n'\
+	'from mock import *' > tests/mock.py
+
+	dh_auto_build
+
+	rm -rf doc/_build/html
+	# Not linked into produced documentation, and breaks on Sphinx < 1
+	rm -f doc/modules/zmq.rst
+	PYTHONPATH=. sphinx-build -N -bhtml doc/ doc/_build/html
+
+override_dh_auto_test:
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	set -e; \
+	for python in $(shell pyversions -r); do \
+		$$python setup.py test; \
+	done
+endif
+
+override_dh_installdocs:
+	dh_installdocs -Xhtml/.buildinfo -Xhtml/.doctrees -Xhtml/_static/jquery.js
+
+override_dh_clean:
+	dh_clean
+	rm -rf *.egg-info
+	rm -rf doc/_build/html
+	rm -f tests/mock.py

Added: packages/python-eventlet/trunk/debian/source/local-options
===================================================================
--- packages/python-eventlet/trunk/debian/source/local-options	                        (rev 0)
+++ packages/python-eventlet/trunk/debian/source/local-options	2011-02-15 14:10:15 UTC (rev 15721)
@@ -0,0 +1 @@
+abort-on-upstream-changes

Modified: packages/python-eventlet/trunk/debian/watch
===================================================================
--- packages/python-eventlet/trunk/debian/watch	2011-02-15 10:37:32 UTC (rev 15720)
+++ packages/python-eventlet/trunk/debian/watch	2011-02-15 14:10:15 UTC (rev 15721)
@@ -1,2 +1,2 @@
 version=3
-http://pypi.python.org/packages/source/e/eventlet/eventlet-(.*)\.(.*)\.(.*)\.tar\.gz
+http://pypi.python.org/packages/source/e/eventlet/eventlet-(.*)\.tar\.gz




More information about the Python-modules-commits mailing list