Control: tags 937784 + patch
Control: tags 953956 + patch

Dear maintainer,

I've prepared an NMU for python-gevent (versioned as 1.4.0-1.2). The diff
is attached to this message.

Please consider maintaining python-gevent with the Debian Python Modules team

Regards.

diff -Nru python-gevent-1.4.0/debian/changelog python-gevent-1.4.0/debian/changelog
--- python-gevent-1.4.0/debian/changelog	2020-03-14 18:47:23.000000000 -0400
+++ python-gevent-1.4.0/debian/changelog	2020-04-10 20:03:00.000000000 -0400
@@ -1,3 +1,11 @@
+python-gevent (1.4.0-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop python2 support; Closes: #937784
+  * Install documentation in python-gevent-doc dir; Closes: #953956
+
+ -- Sandro Tosi <mo...@debian.org>  Fri, 10 Apr 2020 20:03:00 -0400
+
 python-gevent (1.4.0-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru python-gevent-1.4.0/debian/control python-gevent-1.4.0/debian/control
--- python-gevent-1.4.0/debian/control	2020-03-14 18:46:50.000000000 -0400
+++ python-gevent-1.4.0/debian/control	2020-04-10 19:14:24.000000000 -0400
@@ -1,35 +1,20 @@
 Source: python-gevent
 Priority: optional
 Maintainer: Laszlo Boszormenyi (GCS) <g...@debian.org>
-Build-Depends: debhelper (>= 11), dh-python, python-all-dev,
+Build-Depends: debhelper (>= 11), dh-python,
  dh-exec,
- libevent-dev (>= 1.4), python-greenlet (>= 0.4.15) | python-codespeak-lib (<< 1.0),
- python-all-dbg,
- python-greenlet-dbg, python3-greenlet-dbg,
- python-setuptools, python3-setuptools,
- python-cffi,  python-cffi-backend-dbg,
+ libevent-dev (>= 1.4),
+ python3-greenlet-dbg,
+ python3-setuptools,
  python3-cffi, python3-cffi-backend-dbg,
  python3-all-dev, python3-all-dbg, python3-greenlet (>= 0.4.15),
  python3-sphinx, python3-repoze.sphinx.autointerface,
- cython, cython-dbg, cython3,
+ cython3, cython3-dbg,
  libev-dev, libc-ares-dev
 Standards-Version: 4.3.0
 Section: python
 Homepage: http://www.gevent.org/
 
-Package: python-gevent-dbg
-Section: debug
-Architecture: any
-Depends: ${misc:Depends}, python-gevent (= ${binary:Version}), ${shlibs:Depends}, ${python:Depends},
- python-greenlet-dbg
-Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
-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.
-
 Package: python-gevent-doc
 Section: doc
 Architecture: all
@@ -41,17 +26,6 @@
  .
  This is the documentation for gevent.
 
-Package: python-gevent
-Section: python
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-greenlet (>= 0.3.2) | python-codespeak-lib (<< 1.0)
-Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
-Suggests: python-gevent-doc, python-gevent-dbg, python-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
 Section: python
 Architecture: any
diff -Nru python-gevent-1.4.0/debian/python-gevent-dbg.install python-gevent-1.4.0/debian/python-gevent-dbg.install
--- python-gevent-1.4.0/debian/python-gevent-dbg.install	2018-07-07 13:23:32.000000000 -0400
+++ python-gevent-1.4.0/debian/python-gevent-dbg.install	1969-12-31 19:00:00.000000000 -0500
@@ -1,4 +0,0 @@
-usr/lib/python2*/*-packages/gevent/*_d.so
-usr/lib/python2*/*-packages/gevent/libev/*_d.so
-usr/lib/python2*/*-packages/gevent/libuv/*_d.so
-usr/lib/python2*/*-packages/gevent/resolver/*_d.so
diff -Nru python-gevent-1.4.0/debian/python-gevent.docs python-gevent-1.4.0/debian/python-gevent.docs
--- python-gevent-1.4.0/debian/python-gevent.docs	2011-05-17 10:45:37.000000000 -0400
+++ python-gevent-1.4.0/debian/python-gevent.docs	1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-README.rst
-TODO
diff -Nru python-gevent-1.4.0/debian/python-gevent.install python-gevent-1.4.0/debian/python-gevent.install
--- python-gevent-1.4.0/debian/python-gevent.install	2018-07-07 13:23:32.000000000 -0400
+++ python-gevent-1.4.0/debian/python-gevent.install	1969-12-31 19:00:00.000000000 -0500
@@ -1,10 +0,0 @@
-usr/lib/python2*/*-packages/gevent/*.py
-usr/lib/python2*/*-packages/gevent/*[!_][!d].so
-usr/lib/python2*/*-packages/gevent/_ffi/*.py
-usr/lib/python2*/*-packages/gevent/libev/*.py
-usr/lib/python2*/*-packages/gevent/libev/*[!_][!d].so
-usr/lib/python2*/*-packages/gevent/libuv/*.py
-usr/lib/python2*/*-packages/gevent/libuv/*[!_][!d].so
-usr/lib/python2*/*-packages/gevent/resolver/*.py
-usr/lib/python2*/*-packages/gevent/resolver/*[!_][!d].so
-usr/lib/python2*/*-packages/*.egg-info
diff -Nru python-gevent-1.4.0/debian/rules python-gevent-1.4.0/debian/rules
--- python-gevent-1.4.0/debian/rules	2020-03-14 18:47:20.000000000 -0400
+++ python-gevent-1.4.0/debian/rules	2020-04-10 19:53:23.000000000 -0400
@@ -6,10 +6,10 @@
 
 export SHELL = /bin/bash
 
-DOCDIR:=$(CURDIR)/debian/python-gevent-doc/usr/share/doc/python-gevent
+DOCDIR:=$(CURDIR)/debian/python-gevent-doc/usr/share/doc/python-gevent-doc
 
 %:
-	dh  $@ --with python2,python3 --buildsystem=pybuild
+	dh  $@ --with python3 --buildsystem=pybuild
 
 override_dh_auto_build:
 	dh_auto_build
@@ -47,7 +47,6 @@
 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*
 	# remove debug files from main package
 	find debian/python3-gevent -name '*.cpython-3?d*-*.so'| xargs -r rm -f
@@ -57,7 +56,6 @@
 
 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
 
@@ -67,8 +65,6 @@
 #	cd $(CURDIR)/src/greentest && PYTHONPATH=../.. ./testrunner.py
 
 override_dh_installdocs-arch:
-	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
 
 override_dh_installdocs-indep:

Reply via email to