Package: src:python-gevent
Tags: patch

Please build packages for python3, using the upstream 1.1b1 release, maybe
uploading to experimental only.

diff -urN python-gevent-1.0.1/debian/changelog 
python-gevent-1.1~b1/debian/changelog
--- python-gevent-1.0.1/debian/changelog        2014-12-13 07:03:37.000000000 
+0100
+++ python-gevent-1.1~b1/debian/changelog       2015-07-27 16:35:09.039401691 
+0200
@@ -1,3 +1,12 @@
+python-gevent (1.1~b1-0ubuntu1) wily; urgency=medium
+
+  * New upstream version 1.1b1.
+  * Build python3 packages.
+  * Remove the python3 compat files in python-gevent.
+  * Remove the python2 compat files in python3-gevent.
+
+ -- Matthias Klose <d...@ubuntu.com>  Mon, 27 Jul 2015 15:03:46 +0200
+
 python-gevent (1.0.1-2) unstable; urgency=medium
 
   * Add dh-python to Build-Depends.
diff -urN python-gevent-1.0.1/debian/control python-gevent-1.1~b1/debian/control
--- python-gevent-1.0.1/debian/control  2014-12-13 02:24:25.000000000 +0100
+++ python-gevent-1.1~b1/debian/control 2015-07-27 15:55:07.620802078 +0200
@@ -3,7 +3,9 @@
 Maintainer: Laszlo Boszormenyi (GCS) <g...@debian.org>
 Build-Depends: debhelper (>= 9), dh-python, autotools-dev, python-all-dev,
  libevent-dev (>= 1.4), python-greenlet | python-codespeak-lib (<< 1.0),
- python-sphinx (>= 1.0.7+dfsg), python-all-dbg
+ python-sphinx (>= 1.0.7+dfsg), python-all-dbg,
+ python-greenlet-dbg, python3-greenlet-dbg,
+ python3-all-dev, python3-all-dbg, python3-greenlet
 Standards-Version: 3.9.6
 Section: python
 Homepage: http://www.gevent.org/
@@ -38,3 +40,23 @@
 Description: gevent is a coroutine-based Python networking library
  gevent uses greenlet to provide a high-level synchronous API on top of
  libevent event loop.
+
+Package: python3-gevent
+Section: python
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, 
python3-greenlet
+Suggests: python-gevent-doc, python3-gevent-dbg, python3-openssl
+Description: gevent is a coroutine-based Python networking library
+ gevent uses greenlet to provide a high-level synchronous API on top of
+ libevent event loop.
+
+Package: python3-gevent-dbg
+Section: debug
+Architecture: any
+Depends: ${misc:Depends}, python3-gevent (= ${binary:Version}), 
${shlibs:Depends}, ${python3:Depends},
+ python3-greenlet-dbg
+Description: gevent is a coroutine-based Python networking library - debugging 
symbols
+ gevent uses greenlet to provide a high-level synchronous API on top of
+ libevent event loop.
+ .
+ This is the debugging symbols for gevent.
diff -urN python-gevent-1.0.1/debian/patches/series 
python-gevent-1.1~b1/debian/patches/series
--- python-gevent-1.0.1/debian/patches/series   2014-12-13 02:30:36.000000000 
+0100
+++ python-gevent-1.1~b1/debian/patches/series  2015-07-27 15:11:33.872107783 
+0200
@@ -2,7 +2,7 @@
 #gevent-ipv6-dns-workaround.patch
 use-local-intersphinx-inventory.patch
 #fix-gcc-ftbfs.diff
-sslwrap.py
+#sslwrap.py
 #remove.patch
 #remove2.patch
-nossl3.patch
+#nossl3.patch
diff -urN 
python-gevent-1.0.1/debian/patches/use-local-intersphinx-inventory.patch 
python-gevent-1.1~b1/debian/patches/use-local-intersphinx-inventory.patch
--- python-gevent-1.0.1/debian/patches/use-local-intersphinx-inventory.patch    
2014-04-26 18:10:13.000000000 +0200
+++ python-gevent-1.1~b1/debian/patches/use-local-intersphinx-inventory.patch   
2015-07-27 15:09:19.105086341 +0200
@@ -6,14 +6,16 @@
 
 ---
 
---- python-gevent-0.13.7.orig/doc/conf.py
-+++ python-gevent-0.13.7/doc/conf.py
-@@ -38,7 +38,7 @@ if not os.path.exists('changelog.rst') a
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
- extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 
'sphinx.ext.coverage', 'sphinx.ext.intersphinx', 'mysphinxext']
+Index: b/doc/conf.py
+===================================================================
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -40,7 +40,7 @@ if not os.path.exists('changelog.rst') a
+ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 
'sphinx.ext.coverage', 'sphinx.ext.intersphinx', 'mysphinxext',
+               'sphinx.ext.extlinks']
  
--intersphinx_mapping = {'http://docs.python.org/': None}
-+intersphinx_mapping = {'http://docs.python.org/': '../debian/python.inv'}
+-intersphinx_mapping = {'http://docs.python.org/': None,
++intersphinx_mapping = {'http://docs.python.org/': '../debian/python.inv',
+                        'https://greenlet.readthedocs.org/en/latest/': None}
  
- # Add any paths that contain templates here, relative to this directory.
- templates_path = ['_templates']
+ extlinks = {'issue': ('https://github.com/gevent/gevent/issues/%s',
diff -urN python-gevent-1.0.1/debian/python3-gevent-dbg.install 
python-gevent-1.1~b1/debian/python3-gevent-dbg.install
--- python-gevent-1.0.1/debian/python3-gevent-dbg.install       1970-01-01 
01:00:00.000000000 +0100
+++ python-gevent-1.1~b1/debian/python3-gevent-dbg.install      2015-07-27 
15:47:53.213440166 +0200
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/gevent/*.cpython-3?dm-*.so
diff -urN python-gevent-1.0.1/debian/python3-gevent.dirs 
python-gevent-1.1~b1/debian/python3-gevent.dirs
--- python-gevent-1.0.1/debian/python3-gevent.dirs      1970-01-01 
01:00:00.000000000 +0100
+++ python-gevent-1.1~b1/debian/python3-gevent.dirs     2015-07-27 
15:22:40.947557629 +0200
@@ -0,0 +1 @@
+usr/lib
diff -urN python-gevent-1.0.1/debian/python3-gevent.docs 
python-gevent-1.1~b1/debian/python3-gevent.docs
--- python-gevent-1.0.1/debian/python3-gevent.docs      1970-01-01 
01:00:00.000000000 +0100
+++ python-gevent-1.1~b1/debian/python3-gevent.docs     2015-07-27 
15:22:40.951557414 +0200
@@ -0,0 +1,2 @@
+README.rst
+TODO
diff -urN python-gevent-1.0.1/debian/python3-gevent.install 
python-gevent-1.1~b1/debian/python3-gevent.install
--- python-gevent-1.0.1/debian/python3-gevent.install   1970-01-01 
01:00:00.000000000 +0100
+++ python-gevent-1.1~b1/debian/python3-gevent.install  2015-07-27 
15:47:21.868703584 +0200
@@ -0,0 +1,3 @@
+usr/lib/python3*/*-packages/gevent/*.py
+usr/lib/python3*/*-packages/gevent/*.cpython-3?m-*.so
+usr/lib/python3*/*-packages/*.egg-info
diff -urN python-gevent-1.0.1/debian/rules python-gevent-1.1~b1/debian/rules
--- python-gevent-1.0.1/debian/rules    2014-02-01 21:30:08.000000000 +0100
+++ python-gevent-1.1~b1/debian/rules   2015-07-27 16:49:38.726380310 +0200
@@ -4,13 +4,15 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export SHELL = /bin/bash
+
 # TODO: check FTBFS if hardening is enabled
 #export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 #DPKG_EXPORT_BUILDFLAGS = 1
 #include /usr/share/dpkg/buildflags.mk
 
 %:
-       dh  $@ --parallel --with autotools_dev,python2
+       dh  $@ --parallel --with autotools_dev,python2,python3 
--buildsystem=pybuild
 
 override_dh_auto_build:
        dh_auto_build
@@ -24,12 +26,19 @@
        rm -rf $(CURDIR)/gevent.egg-info/
        rm -f $(CURDIR)/greentest/testresults.sqlite3
 
+override_dh_install:
+       dh_install -O--parallel -O--buildsystem=pybuild
+       : # remove the compat stuff for 2/3
+       rm -v -f 
debian/python-gevent/usr/lib/python2.7/dist-packages/gevent/_{util_py,ssl,fileobject,socket}3*
+       rm -v -f 
debian/python3-gevent/usr/lib/python3*/dist-packages/gevent/_{util_py,ssl,fileobject,socket}2*
+
 override_dh_compress:
        dh_compress -X.js -X_static/* -X _sources/* -X_sources/*/* -X.inv
 
 override_dh_strip:
 ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
        dh_strip -p python-gevent --dbg-package=python-gevent-dbg
+       dh_strip -p python3-gevent --dbg-package=python3-gevent-dbg
 endif
 
 # TODO: check for failures
@@ -37,7 +46,9 @@
 #      cd $(CURDIR)/greentest && PYTHONPATH=.. ./testrunner.py --no-db
 
 override_dh_installdocs:
-       dh_installdocs --link-doc=python-gevent
+       dh_installdocs -Npython-gevent-dbg -Npython3-gevent-dbg
+       dh_installdocs -ppython-gevent-dbg --link-doc=python-gevent
+       dh_installdocs -ppython3-gevent-dbg --link-doc=python3-gevent
 
 .PHONY: override_dh_auto_build override_dh_auto_clean override_dh_compress \
        override_dh_strip override_dh_installdocs

Reply via email to