Control: tags 936973 + patch
Dear maintainer, I've prepared an NMU for lxml (versioned as 4.5.0-1.1). The diff is attached to this message. Please consider maintaining lxml within DPMT and migrate d/rules to pybuild Regards.
diff -Nru lxml-4.5.0/debian/changelog lxml-4.5.0/debian/changelog --- lxml-4.5.0/debian/changelog 2020-02-18 10:57:26.000000000 -0500 +++ lxml-4.5.0/debian/changelog 2020-04-13 12:39:33.000000000 -0400 @@ -1,3 +1,12 @@ +lxml (4.5.0-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Drop python2 support; Closes: #936973 + * Install documentation under python-lxml-doc + * python3-lxml takes over some file from python-lxml, so Breaks+Replaces it + + -- Sandro Tosi <mo...@debian.org> Mon, 13 Apr 2020 12:39:33 -0400 + lxml (4.5.0-1) unstable; urgency=medium * New upstream version. diff -Nru lxml-4.5.0/debian/control lxml-4.5.0/debian/control --- lxml-4.5.0/debian/control 2020-02-18 10:57:26.000000000 -0500 +++ lxml-4.5.0/debian/control 2020-04-13 12:39:31.000000000 -0400 @@ -4,51 +4,16 @@ Maintainer: Matthias Klose <d...@debian.org> Build-Depends: debhelper (>= 9), dh-python, - python-all-dev (>= 2.6.6-1~), python-all-dbg, python3-all-dev (>= 3.3.3), python3-all-dbg, - python-pyrex (>= 0.9.4.1), libxml2-dev, libxslt1-dev, zlib1g-dev, - python-setuptools, python3-setuptools (>= 0.6.29), - python-bs4, python3-bs4, - python-html5lib, python3-html5lib, - cython, cython-dbg, cython3, cython3-dbg, + python3-setuptools (>= 0.6.29), + python3-bs4, + python3-html5lib, + cython3, cython3-dbg, X-Python-Version: all Standards-Version: 4.5.0 Homepage: http://lxml.de/ -Package: python-lxml -Architecture: any -Multi-Arch: same -Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} -Provides: ${python:Provides} -Recommends: python-bs4, python-html5lib -Suggests: python-lxml-dbg, python-lxml-doc -Description: pythonic binding for the libxml2 and libxslt libraries - lxml is a new Python binding for libxml2 and libxslt, completely - independent from existing Python bindings. Its aim: - . - * Pythonic API. - * Documented. - * Use Python unicode strings in API. - * Safe (no segfaults). - * No manual memory management! - . - lxml aims to provide a Pythonic API by following as much as possible - the ElementTree API, trying to avoid inventing too many new APIs, - or the user's having to learn new things -- XML is complicated enough. - -Package: python-lxml-dbg -Priority: optional -Section: debug -Architecture: any -Multi-Arch: same -Depends: python-lxml (= ${binary:Version}), python2-dbg, ${shlibs:Depends}, ${misc:Depends} -Description: pythonic binding for the libxml2 and libxslt libraries (debug extension) - lxml is a new Python binding for libxml2 and libxslt, completely - independent from existing Python bindings. - . - This package contains the extension built for the Python debug interpreter. - Package: python3-lxml Architecture: any Multi-Arch: same @@ -56,6 +21,8 @@ Recommends: python3-bs4, python3-html5lib Suggests: python3-lxml-dbg, python-lxml-doc Provides: ${python3:Provides} +Breaks: python-lxml (<< 4.5.0-1.1) +Replaces: python-lxml (<< 4.5.0-1.1) Description: pythonic binding for the libxml2 and libxslt libraries lxml is a new Python binding for libxml2 and libxslt, completely independent from existing Python bindings. Its aim: diff -Nru lxml-4.5.0/debian/python-lxml-doc.doc-base lxml-4.5.0/debian/python-lxml-doc.doc-base --- lxml-4.5.0/debian/python-lxml-doc.doc-base 2015-02-26 23:10:49.000000000 -0500 +++ lxml-4.5.0/debian/python-lxml-doc.doc-base 2020-04-13 12:33:11.000000000 -0400 @@ -8,5 +8,5 @@ Section: Programming/Python Format: html -Index: /usr/share/doc/python-lxml/html/index.html -Files: /usr/share/doc/python-lxml/html/*.html +Index: /usr/share/doc/python-lxml-doc/html/index.html +Files: /usr/share/doc/python-lxml-doc/html/*.html diff -Nru lxml-4.5.0/debian/rules lxml-4.5.0/debian/rules --- lxml-4.5.0/debian/rules 2017-09-23 06:07:30.000000000 -0400 +++ lxml-4.5.0/debian/rules 2020-04-13 12:28:44.000000000 -0400 @@ -4,9 +4,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -PYVERS := $(shell pyversions -vs) -PYVER := $(shell pyversions -vd) - PY3VERS := $(shell py3versions -vs) PY3VER := $(shell py3versions -vd) @@ -21,15 +18,7 @@ build-arch: build build-indep: build -build: build-stamp build3-stamp -build-stamp: $(PYVERS:%=build-python%) $(PYVERS:%=dbg-build-python%) - touch $@ -build-python%: prebuild - python$* setup.py build - touch $@ -dbg-build-python%: prebuild - python$*-dbg setup.py build - touch $@ +build: build3-stamp build3-stamp: $(PY3VERS:%=build3-python%) $(PY3VERS:%=dbg-build3-python%) touch $@ @@ -53,7 +42,7 @@ rm -f src/lxml/lxml-version.h dh_clean -install: build install-prereq $(PYVERS:%=install-python%) $(PYVERS:%=dbg-install-python%) $(PY3VERS:%=install3-python%) $(PY3VERS:%=dbg-install3-python%) +install: build install-prereq $(PY3VERS:%=install3-python%) $(PY3VERS:%=dbg-install3-python%) -find debian -name '*.py[co]' | xargs rm -f -find debian -name __pycache__ | xargs rm -rf rm -rf debian/python*-lxml/usr/lib/python @@ -63,20 +52,6 @@ dh_testroot dh_prep -install-python%: - mkdir -p debian/python-lxml/usr/bin - mkdir -p debian/python-lxml/$(call py_libdir, $*) - python$* setup.py install \ - --root=$(CURDIR)/debian/python-lxml --install-layout=deb - -dbg-install-python%: - mkdir -p debian/python-lxml/usr/bin - mkdir -p debian/python-lxml-dbg/$(call py_libdir, $*) - python$*-dbg setup.py install \ - --root=$(CURDIR)/debian/python-lxml-dbg --install-layout=deb - find debian/python-*-dbg ! -type d ! -name '*.so' | xargs rm -f - find debian/python-*-dbg -depth -empty -exec rmdir {} \; - install3-python%: mkdir -p debian/python3-lxml/usr/bin mkdir -p debian/python3-lxml/$(call py_libdir, $*) @@ -97,9 +72,9 @@ dh_testroot dh_installchangelogs -i dh_installdocs -i - mkdir -p debian/python-lxml-doc/usr/share/doc/python-lxml - cp -r doc/html debian/python-lxml-doc/usr/share/doc/python-lxml/ - ln -sf ../python-lxml/html debian/python-lxml-doc/usr/share/doc/python-lxml-doc/html + mkdir -p debian/python-lxml-doc/usr/share/doc/python-lxml-doc + cp -r doc/html debian/python-lxml-doc/usr/share/doc/python-lxml-doc/ + ln -sf ../python3-lxml/html debian/python-lxml-doc/usr/share/doc/python-lxml-doc/html dh_installexamples -i samples/* dh_compress -i -X.xml -X.py \ -X.html -X.css -X.asc -X.png -Xapi-objects.txt @@ -117,11 +92,7 @@ dh_installchangelogs -a CHANGES.txt dh_installdocs -a CREDITS.txt README.rst TODO.txt dh_installexamples -a samples/* - dh_python2 -a dh_python3 -a - dh_strip -ppython-lxml --dbg-package=python-lxml-dbg - rm -rf debian/python-lxml-dbg/usr/share/doc/python-lxml-dbg - ln -s python-lxml debian/python-lxml-dbg/usr/share/doc/python-lxml-dbg dh_strip -ppython3-lxml --dbg-package=python3-lxml-dbg rm -rf debian/python3-lxml-dbg/usr/share/doc/python3-lxml-dbg ln -s python3-lxml debian/python3-lxml-dbg/usr/share/doc/python3-lxml-dbg
