Control: tags 938313 + patch
Dear maintainer,
I've prepared an NMU for qpid-proton (versioned as 0.22.0-3.3). The diff
is attached to this message.
Regards.
diff -Nru qpid-proton-0.22.0/debian/changelog qpid-proton-0.22.0/debian/changelog
--- qpid-proton-0.22.0/debian/changelog 2019-08-07 22:29:46.000000000 -0400
+++ qpid-proton-0.22.0/debian/changelog 2020-01-02 22:49:44.000000000 -0500
@@ -1,3 +1,10 @@
+qpid-proton (0.22.0-3.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop python2 support; Closes: #938313
+
+ -- Sandro Tosi <mo...@debian.org> Thu, 02 Jan 2020 22:49:44 -0500
+
qpid-proton (0.22.0-3.2) unstable; urgency=medium
* Replace previous NMU with a new source-only upload.
diff -Nru qpid-proton-0.22.0/debian/control qpid-proton-0.22.0/debian/control
--- qpid-proton-0.22.0/debian/control 2019-08-07 20:44:02.000000000 -0400
+++ qpid-proton-0.22.0/debian/control 2020-01-02 22:48:39.000000000 -0500
@@ -11,8 +11,6 @@
doxygen,
libssl-dev,
pkg-config,
- python-all,
- python-all-dev,
python3-all,
python3-all-dev,
swig,
@@ -131,23 +129,6 @@
.
This package provides C++ developer documentation for Qpid Proton.
-Package: python-qpid-proton
-Architecture: any
-Section: python
-Depends: libqpid-proton11,
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends},
-Provides: ${python:Provides},
-Description: language bindings for Qpid Proton messaging framework - Python 2.7
- Qpid Proton is a high-performance, lightweight messaging library. It can be
- used in the widest range of messaging applications, including brokers, client
- libraries, routers, bridges, proxies, and more. Proton makes it trivial to
- integrate with the AMQP 1.0 ecosystem from any platform, environment, or
- language.
- .
- This package provides Python 2.7 language bindings for Qpid Proton.
-
Package: python3-qpid-proton
Architecture: any
Section: python
diff -Nru qpid-proton-0.22.0/debian/python-qpid-proton.install qpid-proton-0.22.0/debian/python-qpid-proton.install
--- qpid-proton-0.22.0/debian/python-qpid-proton.install 2019-08-07 20:44:02.000000000 -0400
+++ qpid-proton-0.22.0/debian/python-qpid-proton.install 1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-usr/lib/python2.7/dist-packages/_cproton.so
-usr/lib/python2.7/dist-packages/cproton.py
-usr/lib/python2.7/dist-packages/proton
diff -Nru qpid-proton-0.22.0/debian/rules qpid-proton-0.22.0/debian/rules
--- qpid-proton-0.22.0/debian/rules 2019-08-07 20:44:02.000000000 -0400
+++ qpid-proton-0.22.0/debian/rules 2020-01-02 22:49:12.000000000 -0500
@@ -21,11 +21,10 @@
export DH_OPTIONS
export DH_ALWAYS_EXCLUDE=LICENSE
-PYTHONS:=$(shell pyversions -vr)
PYTHON3S:=$(shell py3versions -vr)
%:
- dh $@ --with python2,python3
+ dh $@ --with python3
override_dh_auto_configure:
dh_auto_configure -- -DPROTON_DISABLE_RPATH=true -DNOBUILD_RUBY=on -DSYSINSTALL_BINDINGS=on
@@ -52,9 +51,6 @@
mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
mv debian/tmp/usr/lib/lib*.so* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
set -e ; cd obj-$(DEB_BUILD_GNU_TYPE)/proton-c/bindings/python/dist ; \
- for pyvers in $(PYTHONS); do \
- python$$pyvers setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp ; \
- done ; \
for pyvers in $(PYTHON3S); do \
python$$pyvers setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp ; \
done
diff -Nru qpid-proton-0.22.0/debian/tests/control qpid-proton-0.22.0/debian/tests/control
--- qpid-proton-0.22.0/debian/tests/control 2019-08-07 20:44:02.000000000 -0400
+++ qpid-proton-0.22.0/debian/tests/control 2020-01-02 22:49:35.000000000 -0500
@@ -1,5 +1,2 @@
-Test-Command: set -e ; for py in $(pyversions -r 2>/dev/null) ; do cd "$ADTTMP" ; echo "Testing with $py:" ; $py -c "import proton; print proton" ; done
-Depends: python-all, python-qpid-proton
-
Test-Command: set -e ; for py in $(py3versions -r 2>/dev/null) ; do cd "$ADTTMP" ; echo "Testing with $py:" ; $py -c "import proton; print(proton)" ; done
Depends: python3-all, python3-qpid-proton
