Control: tags 938130 + patch

Dear maintainer,

I've prepared an NMU for python-reportlab (versioned as 3.5.31-1.1). The diff
is attached to this message.

Regards.

diff -Nru python-reportlab-3.5.31/debian/changelog python-reportlab-3.5.31/debian/changelog
--- python-reportlab-3.5.31/debian/changelog	2019-10-26 11:25:54.000000000 -0400
+++ python-reportlab-3.5.31/debian/changelog	2020-01-26 16:27:20.000000000 -0500
@@ -1,3 +1,10 @@
+python-reportlab (3.5.31-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop python2 support; Closes: #938130
+
+ -- Sandro Tosi <mo...@debian.org>  Sun, 26 Jan 2020 16:27:20 -0500
+
 python-reportlab (3.5.31-1) unstable; urgency=medium
 
   * New upstream version.
diff -Nru python-reportlab-3.5.31/debian/control python-reportlab-3.5.31/debian/control
--- python-reportlab-3.5.31/debian/control	2019-10-26 11:25:54.000000000 -0400
+++ python-reportlab-3.5.31/debian/control	2020-01-26 16:27:20.000000000 -0500
@@ -5,83 +5,13 @@
 Uploaders: Debian Python Modules Team <python-modules-t...@lists.alioth.debian.org>
 Standards-Version: 4.4.1
 Build-Depends: debhelper (>= 9), dh-python,
-  python-all-dev, python-all-dbg,
   python3-all-dev, python3-all-dbg,
-  python-setuptools, python3-setuptools,
+  python3-setuptools,
 #  libart-2.0-dev,
   libfreetype6-dev, sharutils
 Build-Depends-Indep: python3-pil, python3-sphinx
 Homepage: https://www.reportlab.com/opensource/
 
-Package: python-reportlab
-Architecture: all
-Depends: ${python:Depends}, ${misc:Depends},
-  python-reportlab-accel (>= ${source:Version})
-Recommends: python-renderpm, python-pil
-Suggests: pdf-viewer,
-  python-egenix-mxtexttools (>= 2.0.6-3.1),
-  python-reportlab-doc
-XB-Python-Version: ${python:Versions}
-Description: ReportLab library to create PDF documents using Python
- ReportLab is a library that lets you directly create documents in
- Adobe's Portable Document Format (PDF) using the Python programming language.
- .
- ReportLab library creates PDF based on graphics commands without
- intervening steps. It's therefore extremely fast, and flexible (since
- you're using a full-blown programming language).
- .
- Sample use cases are:
-   * Dynamic PDF generation on the web
-   * High-volume corporate reporting and database publishing
-   * As embeddable print engine for other applications, including a 
-     'report language' so that users can customize their own reports.
-   * As 'build system' for complex documents with charts, tables and text 
-     such as management accounts, statistical reports and scientific papers
-   * from XML to PDF in one step
-
-Package: python-reportlab-accel
-Architecture: any
-Multi-Arch: same
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
-Description: C coded extension accelerator for the ReportLab Toolkit
- A C coded extension accelerator for the ReportLab Toolkit.
-
-Package: python-reportlab-accel-dbg
-Architecture: any
-Multi-Arch: same
-Section: debug
-Depends: python-reportlab-accel (= ${binary:Version}),
-  python2-dbg, ${shlibs:Depends}, ${misc:Depends}
-Description: C coded extension accelerator for the ReportLab Toolkit
- A C coded extension accelerator for the ReportLab Toolkit.
-
-Package: python-renderpm
-Architecture: any
-Multi-Arch: same
-Depends: ${python:Depends}, ${shlibs:Depends},
-  ${misc:Depends}, gsfonts
-Suggests: python-renderpm-dbg
-Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
-Description: python low level render interface
- This package contains the python low level render interface,
- used in the ReportLab library.
-
-Package: python-renderpm-dbg
-Architecture: any
-Multi-Arch: same
-Section: debug
-Depends: python-renderpm (= ${binary:Version}),
-  python2-dbg,
-  ${shlibs:Depends}, ${misc:Depends}
-Description: python low level render interface (debug extension)
- This package contains the python low level render interface,
- used in the ReportLab library.
- .
- This package contains the extension built for the python debug interpreter.
-
 Package: python3-reportlab
 Architecture: all
 Depends: python3-reportlab-accel (>= ${source:Version}),
@@ -150,7 +80,7 @@
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${sphinxdoc:Depends}
-Suggests: python-reportlab
+Suggests: python3-reportlab
 Description: Documentation for the ReportLab Python library (PDF format)
  ReportLab is a library that lets you directly create documents in
  Adobe's Portable Document Format (PDF) using the Python programming language.
diff -Nru python-reportlab-3.5.31/debian/rules python-reportlab-3.5.31/debian/rules
--- python-reportlab-3.5.31/debian/rules	2019-10-26 11:25:54.000000000 -0400
+++ python-reportlab-3.5.31/debian/rules	2020-01-26 16:27:20.000000000 -0500
@@ -4,27 +4,17 @@
 #export DH_VERBOSE=1
 
 # all versions
-PYVERS	:= $(shell pyversions -vs)
-VER	:= $(shell /usr/bin/python2 -c 'import sys; print sys.version[:3]')
-
 PY3VERS	:= $(shell py3versions -vs)
 VER3	:= $(shell /usr/bin/python3 -c 'import sys; print(sys.version[:3])')
 
-include /usr/share/python/python.mk
+include /usr/share/python3/python.mk
 
 setup_options = --no-download-t1-files
 
 build-arch: build
 build-indep: build
 build: build-stamp
-build-stamp: $(PYVERS:%=build-python%) $(PYVERS:%=dbg-build-python%) \
-  $(PY3VERS:%=build3-python%) $(PY3VERS:%=dbg-build3-python%)
-	touch $@
-build-python%:
-	python$* setup.py build $(setup_options)
-	touch $@
-dbg-build-python%:
-	python$*-dbg setup.py build $(setup_options)
+build-stamp: $(PY3VERS:%=build3-python%) $(PY3VERS:%=dbg-build3-python%)
 	touch $@
 build3-python%:
 	python$* setup.py build $(setup_options)
@@ -52,7 +42,6 @@
 	dh_clean
 
 install: build-stamp install-prereq \
-  $(PYVERS:%=install-python%) $(PYVERS:%=install-dbg-python%) \
   $(PY3VERS:%=install3-python%) $(PY3VERS:%=install3-dbg-python%)
 
 install-prereq: build-stamp
@@ -60,61 +49,6 @@
 	dh_testroot
 	dh_prep
 
-install-python%: install-prereq
-	python$* setup.py install \
-		$(setup_options) \
-		--root $(CURDIR)/debian/python-reportlab \
-		--install-layout=deb
-	find debian/python-reportlab -name '*.ttf' | xargs -r rm -f
-	find debian/python-reportlab -name '*.py[co]' | xargs -r rm -f
-
-	mkdir -p debian/python-renderpm/$(call py_libdir,$*)/reportlab/graphics
-	mv debian/python-reportlab/$(call py_libdir,$*)/reportlab/graphics/_renderPM.so \
-		debian/python-renderpm/$(call py_libdir,$*)/reportlab/graphics/
-
-	mkdir -p debian/python-reportlab-accel/$(call py_libdir,$*)/reportlab/lib
-	mv debian/python-reportlab/$(call py_libdir,$*)/reportlab/lib/*.so \
-		debian/python-reportlab-accel/$(call py_libdir,$*)/reportlab/lib/
-
-	install -d debian/python-reportlab-doc/usr/share/doc/python-reportlab
-
-	: # remove test, docs and demo files
-	rm -rf debian/python-reportlab/usr/lib/python$*/*-packages/reportlab/demos
-	rm -rf debian/python-reportlab/usr/lib/python$*/*-packages/reportlab/tools/pythonpoint/demos
-	rm -rf debian/python-reportlab/usr/lib/python$*/*-packages/reportlab/docs
-	rm -rf debian/python-reportlab/usr/lib/python$*/*-packages/reportlab/test
-	rm -rf debian/python-reportlab/usr/lib/python$*/*-packages/reportlab/fonts
-
-	rm -f debian/python-reportlab/usr/lib/python$*/*-packages/reportlab/README.txt
-	rm -f debian/python-reportlab/usr/lib/python$*/*-packages/reportlab/CHANGES.txt
-
-#	-find debian -name '*.so' | xargs rm -f
-
-	: # Replace all '#!' calls to python with python2
-	: # and make them executable
-	for i in `find debian/python-reportlab -type f`; do \
-	  sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python2\1,' \
-		$$i > $$i.temp; \
-	  if cmp --quiet $$i $$i.temp; then \
-	    rm -f $$i.temp; \
-	  else \
-	    mv -f $$i.temp $$i; \
-	    chmod 755 $$i; \
-	    echo "fixed interpreter: $$i"; \
-	  fi; \
-	done
-
-install-dbg-python%: install-prereq
-	python$*-dbg setup.py install \
-		$(setup_options) \
-		--root $(CURDIR)/debian/python-reportlab-accel-dbg \
-		--install-layout=deb
-	find debian/python-reportlab-accel-dbg ! -type d ! -name '*_d.so' | xargs rm -f
-	find debian/python-reportlab-accel-dbg -depth -empty -exec rmdir {} \;
-	mkdir -p debian/python-renderpm-dbg/$(call py_libdir,$*)/reportlab/graphics
-	mv debian/python-reportlab-accel-dbg/$(call py_libdir,$*)/reportlab/graphics/_renderPM_d.so \
-		debian/python-renderpm-dbg/$(call py_libdir,$*)/reportlab/graphics
-
 install3-python%: install-prereq
 	python$* setup.py install \
 		$(setup_options) \
@@ -203,7 +137,6 @@
 	dh_link -i
 	dh_compress -i -X.py -X.pdf -X.js -Xodyssey.txt -X.xml
 	dh_fixperms -i
-	dh_python2 -ppython-reportlab
 	dh_python3 -ppython3-reportlab
 	dh_installdeb -i
 	dh_gencontrol -i
@@ -217,11 +150,6 @@
 	dh_installdocs -a
 	dh_installchangelogs -a
 
-	rm -rf debian/python-renderpm-dbg/usr/share/doc/python-renderpm-dbg
-	ln -s python-renderpm debian/python-renderpm-dbg/usr/share/doc/python-renderpm-dbg
-	rm -rf debian/python-reportlab-accel-dbg/usr/share/doc/python-reportlab-accel-dbg
-	ln -s python-reportlab-accel debian/python-reportlab-accel-dbg/usr/share/doc/python-reportlab-accel-dbg
-
 	rm -rf debian/python3-renderpm-dbg/usr/share/doc/python3-renderpm-dbg
 	ln -s python3-renderpm debian/python3-renderpm-dbg/usr/share/doc/python3-renderpm-dbg
 	rm -rf debian/python3-reportlab-accel-dbg/usr/share/doc/python3-reportlab-accel-dbg
@@ -229,14 +157,9 @@
 
 	dh_compress -a -X.py -X.pdf -Xodyssey.txt -X.xml
 	dh_fixperms -a
-	dh_python2 \
-		-ppython-renderpm -ppython-reportlab-accel \
-		-ppython-renderpm-dbg -ppython-reportlab-accel-dbg
 	dh_python3 \
 		-ppython3-renderpm -ppython3-reportlab-accel \
 		-ppython3-renderpm-dbg -ppython3-reportlab-accel-dbg
-	dh_strip -ppython-renderpm --dbg-package=python-renderpm-dbg
-	dh_strip -ppython-reportlab-accel --dbg-package=python-reportlab-accel-dbg
 	dh_strip -ppython3-renderpm --dbg-package=python3-renderpm-dbg
 	dh_strip -ppython3-reportlab-accel --dbg-package=python3-reportlab-accel-dbg
 	dh_installdeb -a

Reply via email to