On Fri, Feb 21, 2020 at 02:34:04PM +0100, Mattia Rizzolo wrote:
> found 936941 2.9.10+dfsg-2
> thanks
With the removal of gnome-doc-utils the only remaining rdep of python-libxml2
is gone (apart from src:chirp, but it's already uninstallable for various other
packages which have dropped Py2 support, so can be safely ignored).
Patch attached.
Cheers,
Moritz
diff -Naur libxml2-2.9.10+dfsg.orig/debian/control libxml2-2.9.10+dfsg/debian/control
--- libxml2-2.9.10+dfsg.orig/debian/control 2020-04-10 14:06:33.000000000 +0200
+++ libxml2-2.9.10+dfsg/debian/control 2020-06-16 23:38:24.897946252 +0200
@@ -17,13 +17,9 @@
dh-python <!nopython>,
libicu-dev,
liblzma-dev,
- libpython-all-dbg <!nopython>,
- libpython-all-dev <!nopython>,
libpython3-all-dbg <!nopython>,
libpython3-all-dev <!nopython>,
pkg-config,
- python-all-dbg:any <!nopython>,
- python-all-dev:any (>= 2.7.5-5~) <!nopython>,
python3-all-dbg:any <!nopython>,
python3-all-dev:any (>= 3.5) <!nopython>,
rename,
@@ -112,45 +108,6 @@
This package contains general information about the GNOME XML library
and more specific API references.
-Package: python-libxml2
-Architecture: any
-Build-Profiles: <!nopython>
-Section: python
-Depends:
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends},
-Description: Python bindings for the GNOME XML library
- XML is a metalanguage to let you design your own markup language.
- A regular markup language defines a way to describe information in
- a certain class of documents (eg HTML). XML lets you define your
- own customized markup languages for many classes of document. It
- can do this because it's written in SGML, the international standard
- metalanguage for markup languages.
- .
- This package contains the files needed to use the GNOME XML library
- in Python programs.
-
-Package: python-libxml2-dbg
-Architecture: any
-Build-Profiles: <!nopython>
-Section: debug
-Depends:
- python-libxml2 (= ${binary:Version}),
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends},
-Description: Python bindings for the GNOME XML library (debug extension)
- XML is a metalanguage to let you design your own markup language.
- A regular markup language defines a way to describe information in
- a certain class of documents (eg HTML). XML lets you define your
- own customized markup languages for many classes of document. It
- can do this because it's written in SGML, the international standard
- metalanguage for markup languages.
- .
- This package contains the files needed to use the GNOME XML library
- in Python programs for use with the Python debug interpreter.
-
Package: python3-libxml2
Architecture: any
Build-Profiles: <!nopython>
diff -Naur libxml2-2.9.10+dfsg.orig/debian/python-libxml2-dbg.install libxml2-2.9.10+dfsg/debian/python-libxml2-dbg.install
--- libxml2-2.9.10+dfsg.orig/debian/python-libxml2-dbg.install 2020-02-27 19:21:38.000000000 +0100
+++ libxml2-2.9.10+dfsg/debian/python-libxml2-dbg.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/python2*/*-packages/*.so
diff -Naur libxml2-2.9.10+dfsg.orig/debian/python-libxml2-dbg.lintian-overrides libxml2-2.9.10+dfsg/debian/python-libxml2-dbg.lintian-overrides
--- libxml2-2.9.10+dfsg.orig/debian/python-libxml2-dbg.lintian-overrides 2020-02-27 19:21:38.000000000 +0100
+++ libxml2-2.9.10+dfsg/debian/python-libxml2-dbg.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-python-libxml2-dbg: hardening-no-fortify-functions
diff -Naur libxml2-2.9.10+dfsg.orig/debian/python-libxml2.examples libxml2-2.9.10+dfsg/debian/python-libxml2.examples
--- libxml2-2.9.10+dfsg.orig/debian/python-libxml2.examples 2020-02-27 19:21:38.000000000 +0100
+++ libxml2-2.9.10+dfsg/debian/python-libxml2.examples 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-python/tests/*.py
-python/tests/*.xml
diff -Naur libxml2-2.9.10+dfsg.orig/debian/python-libxml2.install libxml2-2.9.10+dfsg/debian/python-libxml2.install
--- libxml2-2.9.10+dfsg.orig/debian/python-libxml2.install 2020-02-27 19:21:38.000000000 +0100
+++ libxml2-2.9.10+dfsg/debian/python-libxml2.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib/python2*/*-packages/*.py*
-usr/lib/python2*/*-packages/*.so
diff -Naur libxml2-2.9.10+dfsg.orig/debian/rules libxml2-2.9.10+dfsg/debian/rules
--- libxml2-2.9.10+dfsg.orig/debian/rules 2020-04-10 14:39:54.000000000 +0200
+++ libxml2-2.9.10+dfsg/debian/rules 2020-06-16 23:37:32.552359795 +0200
@@ -3,12 +3,6 @@
DOPACKAGES = $(shell dh_listpackages)
-ifneq (,$(filter python-libxml2 python-libxml2-dbg,$(DOPACKAGES)))
-# The versions of python currently supported
-PYVERS=$(shell pyversions -s)
-else
-PYVERS=
-endif
ifneq (,$(filter python3-libxml2 python3-libxml2-dbg,$(DOPACKAGES)))
# The versions of python3 currently supported
PY3VERS=$(shell py3versions -s)
@@ -23,7 +17,7 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-TARGETS := main $(PYVERS) $(PYVERS:%=%-dbg) $(PY3VERS) $(PY3VERS:%=%-dbg)
+TARGETS := main $(PY3VERS) $(PY3VERS:%=%-dbg)
CONFIGURE_FLAGS := --with-history --cache-file="$(CURDIR)/builddir/config.cache"
@@ -99,19 +93,13 @@
dh_installchangelogs -k NEWS
override_dh_install-arch:
- dh_install -Npython-libxml2-dbg -Npython3-libxml2-dbg
-ifneq (,$(filter python-libxml2-dbg,$(DOPACKAGES)))
- dh_install -ppython-libxml2-dbg --sourcedir=debian/tmp-dbg
-endif
+ dh_install -Npython3-libxml2-dbg
ifneq (,$(filter python3-libxml2-dbg,$(DOPACKAGES)))
dh_install -ppython3-libxml2-dbg --sourcedir=debian/tmp-dbg
endif
sed -i -e 's,/lib/$(DEB_HOST_MULTIARCH),/lib,' debian/libxml2-dev/usr/bin/xml2-config
override_dh_strip:
-ifneq (,$(filter python-libxml2 python-libxml2-dbg,$(DOPACKAGES)))
- dh_strip -ppython-libxml2 --dbg-package=python-libxml2-dbg
-endif
ifneq (,$(filter python3-libxml2 python3-libxml2-dbg,$(DOPACKAGES)))
dh_strip -ppython3-libxml2 --dbg-package=python3-libxml2-dbg
endif
@@ -129,7 +117,6 @@
build-arch binary-arch:
dh $@ \
- $(if $(filter python-libxml2 python-libxml2-dbg,$(DOPACKAGES)),--with python2) \
$(if $(filter python3-libxml2 python3-libxml2-dbg,$(DOPACKAGES)),--with python3)
build: build-arch build-indep
