Control: tags 938410 + patch Control: tags 938410 + pending Dear maintainer,
I've prepared an NMU for rpm (versioned as 4.14.2.1+dfsg1-1.1) and
uploaded it to DELAYED/15. Please feel free to tell me if I
should delay it longer.
Regards,
Boyuan Yang
diff -Nru rpm-4.14.2.1+dfsg1/debian/changelog rpm-
4.14.2.1+dfsg1/debian/changelog
--- rpm-4.14.2.1+dfsg1/debian/changelog 2019-02-17 03:19:38.000000000 -0500
+++ rpm-4.14.2.1+dfsg1/debian/changelog 2020-02-28 13:52:17.000000000 -0500
@@ -1,3 +1,23 @@
+rpm (4.14.2.1+dfsg1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/control:
+ + Bump Standards-Version to 4.5.0.
+ + Bump debhelper compat to v12.
+ - Drop python-rpm package and python2 support. (Closes: #938410)
+ + Use secure URI for homepage information.
+ + Let librpm-dev depends on libzstd-dev. Please see #940114.
+ * debian/rules:
+ + Let buildtools.mk to provide proper $PKG_CONFIG.
+ + Use architecture.mk instead of manual dpkg-architecture
+ invocation.
+ - Drop dh_strip override, migration is now complete.
+ + Use "dh_missing --fail-missing".
+ * debian/patches: Add patch 0012 to force using python3 in shebang
+ for pythondeps.sh.
+
+ -- Boyuan Yang <by...@debian.org> Fri, 28 Feb 2020 13:52:17 -0500
+
rpm (4.14.2.1+dfsg1-1) unstable; urgency=medium
* New upstream release.
diff -Nru rpm-4.14.2.1+dfsg1/debian/compat rpm-4.14.2.1+dfsg1/debian/compat
--- rpm-4.14.2.1+dfsg1/debian/compat 2016-07-07 06:04:15.000000000 -0400
+++ rpm-4.14.2.1+dfsg1/debian/compat 1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-9
diff -Nru rpm-4.14.2.1+dfsg1/debian/control rpm-4.14.2.1+dfsg1/debian/control
--- rpm-4.14.2.1+dfsg1/debian/control 2019-02-17 03:19:07.000000000 -0500
+++ rpm-4.14.2.1+dfsg1/debian/control 2020-02-28 13:35:40.000000000 -0500
@@ -3,14 +3,8 @@
Uploaders: Michal Čihař <ni...@debian.org>
Section: admin
Priority: optional
-Build-Depends: debhelper (>= 9.20160114),
- dh-autoreconf,
- dh-python,
- libtool,
- autoconf,
- automake,
- autotools-dev,
- autopoint,
+Build-Depends: debhelper-compat (= 12),
+ dh-sequence-python3,
zlib1g-dev,
libbz2-dev,
libpopt-dev,
@@ -23,7 +17,6 @@
libcap-dev [linux-any],
libdbus-1-dev,
libsqlite3-dev,
- python-all-dev,
python3-all-dev,
binutils-dev,
bzip2,
@@ -39,10 +32,10 @@
libdb-dev,
liblua5.2-dev,
libsemanage1-dev [linux-any]
-Standards-Version: 4.3.0
+Standards-Version: 4.5.0
Vcs-Browser: https://salsa.debian.org/pkg-rpm-team/rpm
Vcs-Git: https://salsa.debian.org/pkg-rpm-team/rpm.git
-Homepage: http://rpm.org/
+Homepage: https://rpm.org/
Package: rpm
Architecture: any
@@ -53,7 +46,7 @@
debugedit (= ${binary:Version}),
rpm-common (= ${binary:Version})
Suggests: alien,
- python,
+ python3,
elfutils,
rpmlint,
rpm2html,
@@ -176,6 +169,7 @@
zlib1g-dev,
libxml2-dev,
libreadline-dev,
+ libzstd-dev,
libselinux1-dev [linux-any],
libsqlite3-dev,
${misc:Depends}
@@ -188,30 +182,6 @@
libraries and header files necessary to build programs that use
librpm.
-Package: python-rpm
-Architecture: any
-Section: python
-Priority: optional
-Depends: ${misc:Depends},
- ${shlibs:Depends},
- ${python:Depends},
- librpm8 (= ${binary:Version}),
- librpmio8 (= ${binary:Version}),
- librpmbuild8 (= ${binary:Version}),
- librpmsign8 (= ${binary:Version}),
- rpm-common (= ${binary:Version})
-Breaks: ${python:Breaks}
-Provides: ${python:Provides}
-Description: Python bindings for RPM
- The RPM Package Manager (RPM) is a command-line driven package
- management system capable of installing, uninstalling, verifying,
- querying, and updating computer software packages.
- .
- This package includes the Python bindings for librpm, allowing Python
- scripts to manipulate RPM packages and the RPM database.
- .
- This package installs the library for Python 2.
-
Package: python3-rpm
Architecture: any
Section: python
diff -Nru rpm-4.14.2.1+dfsg1/debian/patches/0012-pythondistdeps.py-Use-
python3-in-shebang.patch rpm-4.14.2.1+dfsg1/debian/patches/0012-
pythondistdeps.py-Use-python3-in-shebang.patch
--- rpm-4.14.2.1+dfsg1/debian/patches/0012-pythondistdeps.py-Use-python3-in-
shebang.patch 1969-12-31 19:00:00.000000000 -0500
+++ rpm-4.14.2.1+dfsg1/debian/patches/0012-pythondistdeps.py-Use-python3-in-
shebang.patch 2020-02-28 13:52:04.000000000 -0500
@@ -0,0 +1,18 @@
+From: Boyuan Yang <by...@debian.org>
+Date: Fri, 28 Feb 2020 13:52:02 -0500
+Subject: pythondistdeps.py: Use python3 in shebang
+
+---
+ scripts/pythondistdeps.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/pythondistdeps.py b/scripts/pythondistdeps.py
+index ac1cd62..4f3c9c0 100755
+--- a/scripts/pythondistdeps.py
++++ b/scripts/pythondistdeps.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright 2010 Per Øyvind Karlsen <proyv...@moondrake.org>
diff -Nru rpm-4.14.2.1+dfsg1/debian/patches/series rpm-
4.14.2.1+dfsg1/debian/patches/series
--- rpm-4.14.2.1+dfsg1/debian/patches/series 2018-01-23 07:25:15.000000000
-0500
+++ rpm-4.14.2.1+dfsg1/debian/patches/series 2020-02-28 13:52:04.000000000
-0500
@@ -9,3 +9,4 @@
autogen-cleanup.patch
lua-libname.patch
rpm-4.10.90-rpmlib-filesystem-check.patch
+0012-pythondistdeps.py-Use-python3-in-shebang.patch
diff -Nru rpm-4.14.2.1+dfsg1/debian/python-rpm.install rpm-
4.14.2.1+dfsg1/debian/python-rpm.install
--- rpm-4.14.2.1+dfsg1/debian/python-rpm.install 2016-07-07
06:04:15.000000000 -0400
+++ rpm-4.14.2.1+dfsg1/debian/python-rpm.install 1969-12-31
19:00:00.000000000 -0500
@@ -1 +0,0 @@
-usr/lib/python2*
diff -Nru rpm-4.14.2.1+dfsg1/debian/rules rpm-4.14.2.1+dfsg1/debian/rules
--- rpm-4.14.2.1+dfsg1/debian/rules 2017-11-08 04:35:49.000000000 -0500
+++ rpm-4.14.2.1+dfsg1/debian/rules 2020-02-28 13:35:49.000000000 -0500
@@ -1,11 +1,19 @@
#!/usr/bin/make -f
-
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+# -*- makefile -*-
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+
+# For DEB_HOST_ARCH_OS
+include /usr/share/dpkg/architecture.mk
+
+# For proper pkg-config
+DPKG_EXPORT_BUILDTOOLS = 1
+include /usr/share/dpkg/buildtools.mk
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
-CPPFLAGS+=$(shell pkg-config --cflags nss)
+CPPFLAGS+=$(shell $(PKG_CONFIG) --cflags nss)
ifeq (linux,$(DEB_HOST_ARCH_OS))
configure_flags +=--with-cap --with-selinux
@@ -44,8 +52,8 @@
# Fix permissions
chmod +x debian/tmp/usr/lib/rpm/rpm.daily
-override_dh_strip:
- dh_strip --ddeb-migration='librpm-dbg (<< 4.12.0.1+dfsg1-5~)'
+override_dh_missing:
+ dh_missing --fail-missing
%:
- dh $@ --fail-missing --with python2,python3,autoreconf
+ dh $@
signature.asc
Description: This is a digitally signed message part
