Package: python-dmidecode Version: 3.12.2-10 Followup-For: Bug #949486 User: [email protected] Usertags: origin-ubuntu focal ubuntu-patch
Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * Use pkg-config to find libxml2 linker flags (fixes Debian #949486). Thanks for considering the patch. Logan Rosen -- System Information: Debian Release: buster/sid APT prefers eoan-updates APT policy: (500, 'eoan-updates'), (500, 'eoan-security'), (500, 'eoan'), (100, 'eoan-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 5.3.0-29-generic (SMP w/8 CPU cores) Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled
diff -Nru python-dmidecode-3.12.2/debian/control python-dmidecode-3.12.2/debian/control --- python-dmidecode-3.12.2/debian/control 2019-08-21 14:12:13.000000000 -0400 +++ python-dmidecode-3.12.2/debian/control 2020-02-19 20:37:26.000000000 -0500 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Sandro Tosi <[email protected]> Uploaders: Debian Python Modules Team <[email protected]> -Build-Depends: debhelper-compat (= 10), dh-python, python3-all-dev, python3-all-dbg, libxml2-dev, python3-libxml2 +Build-Depends: debhelper-compat (= 10), dh-python, python3-all-dev, python3-all-dbg, libxml2-dev, python3-libxml2, pkg-config Standards-Version: 4.4.0 Vcs-Git: https://salsa.debian.org/python-team/modules/python-dmidecode.git Vcs-Browser: https://salsa.debian.org/python-team/modules/python-dmidecode diff -Nru python-dmidecode-3.12.2/debian/patches/0005-pkg-config.patch python-dmidecode-3.12.2/debian/patches/0005-pkg-config.patch --- python-dmidecode-3.12.2/debian/patches/0005-pkg-config.patch 1969-12-31 19:00:00.000000000 -0500 +++ python-dmidecode-3.12.2/debian/patches/0005-pkg-config.patch 2020-02-19 20:37:26.000000000 -0500 @@ -0,0 +1,21 @@ +--- a/src/setup_common.py ++++ b/src/setup_common.py +@@ -54,14 +54,14 @@ + if os_path.exists("/etc/debian_version"): #. XXX: Debian Workaround... + libdir.append("/usr/lib/pymodules/python%d.%d"%sys.version_info[0:2]) + +- (res, libxml2_libs) = subprocess.getstatusoutput("xml2-config --libs") ++ (res, libxml2_libs) = subprocess.getstatusoutput("pkg-config --libs libxml-2.0") + if res != 0: + print("Could not build python-dmidecode.") +- print("Could not run xml2-config, is libxml2 installed?") +- print("Also the development libraries?") ++ print("Could not run pkg-config, is it installed?") ++ print("Also the development libraries for libxml2?") + sys.exit(1) + +- # Parse the xml2-config --libs response ++ # Parse the pkg-config --libs libxml-2.0 response + for l in libxml2_libs.split(" "): + if l.find('-L') == 0: + libdir.append(l.replace("-L", "", 1)) diff -Nru python-dmidecode-3.12.2/debian/patches/series python-dmidecode-3.12.2/debian/patches/series --- python-dmidecode-3.12.2/debian/patches/series 2019-08-21 14:12:13.000000000 -0400 +++ python-dmidecode-3.12.2/debian/patches/series 2020-02-19 20:34:48.000000000 -0500 @@ -2,3 +2,4 @@ 0002-Stop-linking-with-libxml2mod.patch 0003-Fix-memory-Type-Detail-map-size.patch 0004-makefile-dont-cp.patch +0005-pkg-config.patch
