Control: tags 937800 + patch

Dear maintainer,

I've prepared an NMU for python-greenlet (versioned as 0.4.15-4.2). The diff
is attached to this message.

Please consider maintaining this package in the DPMT

Regards.

diff -Nru python-greenlet-0.4.15/debian/changelog python-greenlet-0.4.15/debian/changelog
--- python-greenlet-0.4.15/debian/changelog	2020-03-14 18:37:04.000000000 -0400
+++ python-greenlet-0.4.15/debian/changelog	2020-04-10 20:20:10.000000000 -0400
@@ -1,3 +1,11 @@
+python-greenlet (0.4.15-4.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop python2 support; Closes: #937800
+  * Install documentation in python-greenlet-doc directory
+
+ -- Sandro Tosi <mo...@debian.org>  Fri, 10 Apr 2020 20:20:10 -0400
+
 python-greenlet (0.4.15-4.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru python-greenlet-0.4.15/debian/control python-greenlet-0.4.15/debian/control
--- python-greenlet-0.4.15/debian/control	2020-03-14 18:33:51.000000000 -0400
+++ python-greenlet-0.4.15/debian/control	2020-04-10 20:11:17.000000000 -0400
@@ -2,34 +2,13 @@
 Priority: optional
 Maintainer: Laszlo Boszormenyi (GCS) <g...@debian.org>
 Build-Depends: debhelper (>= 11), dh-python,
- python-all-dev, python-all-dbg,
  python3-all-dev, python3-all-dbg,
- python-setuptools, python3-setuptools,
+ python3-setuptools,
  python3-sphinx
 Standards-Version: 4.4.1
 Section: python
 Homepage: https://pypi.python.org/pypi/greenlet
 
-Package: python-greenlet-dbg
-Section: debug
-Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, python-greenlet (= ${binary:Version}), ${python:Depends}
-Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
-Recommends: python-dbg
-Description: Lightweight in-process concurrent programming - debugging symbols
- The greenlet package is a spin-off of Stackless, a version of CPython that
- supports micro-threads called "tasklets". Tasklets run pseudo-concurrently
- (typically in a single or a few OS-level threads) and are synchronized with
- data exchanges on "channels".
- .
- greenlet is the standalone package derived from the py lib, and is used by
- several non-blocking IO packages as a more flexible alternative to Python's
- built in coroutines.
- .
- This is the debugging symbols for greenlet.
-
 Package: python3-greenlet-dbg
 Section: debug
 Architecture: any
@@ -56,7 +35,7 @@
 Multi-Arch: foreign
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, libjs-jquery, libjs-underscore
-Suggests: python-greenlet, python-greenlet-dev
+Suggests: python3-greenlet, python-greenlet-dev
 Description: Lightweight in-process concurrent programming - documentation
  The greenlet package is a spin-off of Stackless, a version of CPython that
  supports micro-threads called "tasklets". Tasklets run pseudo-concurrently
@@ -72,7 +51,7 @@
 Package: python-greenlet-dev
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, python-greenlet (= ${binary:Version}) | python3-greenlet (= ${binary:Version})
+Depends: ${misc:Depends}, python3-greenlet (= ${binary:Version})
 Description: Lightweight in-process concurrent programming - development files
  The greenlet package is a spin-off of Stackless, a version of CPython that
  supports micro-threads called "tasklets". Tasklets run pseudo-concurrently
@@ -85,23 +64,6 @@
  .
  This is the development package for greenlet.
 
-Package: python-greenlet
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
-Conflicts: python-codespeak-lib (<< 1.0)
-Suggests: python-greenlet-doc, python-greenlet-dev, python-greenlet-dbg
-Description: Lightweight in-process concurrent programming
- The greenlet package is a spin-off of Stackless, a version of CPython that
- supports micro-threads called "tasklets". Tasklets run pseudo-concurrently
- (typically in a single or a few OS-level threads) and are synchronized with
- data exchanges on "channels".
- .
- greenlet is the standalone package derived from the py lib, and is used by
- several non-blocking IO packages as a more flexible alternative to Python's
- built in coroutines.
-
 Package: python3-greenlet
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
diff -Nru python-greenlet-0.4.15/debian/python-greenlet-dbg.install python-greenlet-0.4.15/debian/python-greenlet-dbg.install
--- python-greenlet-0.4.15/debian/python-greenlet-dbg.install	2018-09-17 13:29:42.000000000 -0400
+++ python-greenlet-0.4.15/debian/python-greenlet-dbg.install	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-usr/lib/python*/*-packages/*_d.so
diff -Nru python-greenlet-0.4.15/debian/python-greenlet-dbg.maintscript python-greenlet-0.4.15/debian/python-greenlet-dbg.maintscript
--- python-greenlet-0.4.15/debian/python-greenlet-dbg.maintscript	2018-09-17 13:29:42.000000000 -0400
+++ python-greenlet-0.4.15/debian/python-greenlet-dbg.maintscript	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-symlink_to_dir /usr/share/doc/python-greenlet-dbg python-greenlet 0.4.10-1~
diff -Nru python-greenlet-0.4.15/debian/python-greenlet-doc.doc-base python-greenlet-0.4.15/debian/python-greenlet-doc.doc-base
--- python-greenlet-0.4.15/debian/python-greenlet-doc.doc-base	2018-06-13 15:28:37.000000000 -0400
+++ python-greenlet-0.4.15/debian/python-greenlet-doc.doc-base	2020-04-10 20:19:00.000000000 -0400
@@ -5,5 +5,5 @@
 Section: Programming/Python
 
 Format: HTML
-Index: /usr/share/doc/python-greenlet/html/index.html
-Files: /usr/share/doc/python-greenlet/html/greenlet.html
+Index: /usr/share/doc/python-greenlet-doc/html/index.html
+Files: /usr/share/doc/python-greenlet-doc/html/greenlet.html
diff -Nru python-greenlet-0.4.15/debian/python-greenlet-doc.links python-greenlet-0.4.15/debian/python-greenlet-doc.links
--- python-greenlet-0.4.15/debian/python-greenlet-doc.links	2018-07-16 14:52:16.000000000 -0400
+++ python-greenlet-0.4.15/debian/python-greenlet-doc.links	2020-04-10 20:20:07.000000000 -0400
@@ -1,2 +1,2 @@
-/usr/share/javascript/jquery/jquery.js /usr/share/doc/python-greenlet/html/_static/jquery.js
-/usr/share/javascript/underscore/underscore.js /usr/share/doc/python-greenlet/html/_static/underscore.js
+/usr/share/javascript/jquery/jquery.js /usr/share/doc/python-greenlet-doc/html/_static/jquery.js
+/usr/share/javascript/underscore/underscore.js /usr/share/doc/python-greenlet-doc/html/_static/underscore.js
diff -Nru python-greenlet-0.4.15/debian/python-greenlet.docs python-greenlet-0.4.15/debian/python-greenlet.docs
--- python-greenlet-0.4.15/debian/python-greenlet.docs	2012-02-11 15:11:04.000000000 -0500
+++ python-greenlet-0.4.15/debian/python-greenlet.docs	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-README.rst
-AUTHORS
-NEWS
diff -Nru python-greenlet-0.4.15/debian/python-greenlet.install python-greenlet-0.4.15/debian/python-greenlet.install
--- python-greenlet-0.4.15/debian/python-greenlet.install	2014-02-01 06:26:44.000000000 -0500
+++ python-greenlet-0.4.15/debian/python-greenlet.install	1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-usr/lib/python2*/*-packages/*.egg-info
-usr/lib/python2*/*-packages/*[!_][!_].so
diff -Nru python-greenlet-0.4.15/debian/rules python-greenlet-0.4.15/debian/rules
--- python-greenlet-0.4.15/debian/rules	2020-03-14 18:34:51.000000000 -0400
+++ python-greenlet-0.4.15/debian/rules	2020-04-10 20:14:44.000000000 -0400
@@ -7,13 +7,12 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
-PYTHON2 := $(shell pyversions -sv)
 PYTHON3 := $(shell py3versions -sv)
 
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 %:
-	dh $@ --with python2,python3 --buildsystem=pybuild
+	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_auto_clean:
 	rm -rf build/ .pybuild/
@@ -43,7 +42,7 @@
 	# remove debug files from main package
 	$(RM) $(CURDIR)/debian/python3-greenlet/usr/lib/python3*/*-packages/*.cpython-3?d*-*.so
 
-override_dh_auto_test: $(PYTHON2:%=test-%-stamp) $(PYTHON3:%=test-%-stamp)
+override_dh_auto_test: $(PYTHON3:%=test-%-stamp)
 test-%-stamp:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	rm -rf build/test-$*
@@ -59,7 +58,6 @@
 
 override_dh_strip:
 ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	dh_strip -p python-greenlet --dbg-package=python-greenlet-dbg
 	dh_strip -p python3-greenlet --dbg-package=python3-greenlet-dbg
 endif
 

Reply via email to