Commit b32489f9 authored by Helmut Grohne's avatar Helmut Grohne

drop bdsat patch #894824 applied in popt/1.16-11

parent 36542acc
......@@ -1910,22 +1910,7 @@ patch_pcre3() {
sed -i -e 's/\(dh_makeshlibs.*-- -c\)4$/\10/' debian/rules
}
patch_popt() {
echo "adding <nocheck> annotation #894824"
drop_privs patch -p1 <<'EOF'
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Michael Jeanson <mjeanson@debian.org>
Build-Depends: debhelper (>= 9~), gettext (>= 0.18.1.1-8), dh-autoreconf,
- api-sanity-checker
+ api-sanity-checker <!nocheck>
Standards-Version: 4.1.3
Vcs-Git: https://salsa.debian.org/debian/popt.git
Vcs-Browser: https://salsa.debian.org/debian/popt.git
EOF
}
add_automatic popt
builddep_readline() {
assert_built "ncurses"
......@@ -2683,6 +2668,7 @@ add_need nettle # by unbound
add_need openssl # by cyrus-sasl2
add_need patch # for dpkg-dev
add_need pcre3 # by libselinux
add_need popt # by newt
add_need readline5 # by lvm2
add_need slang2 # by cdebconf, newt
add_need sqlite3 # by python2.7
......@@ -3200,11 +3186,6 @@ mark_built gdbm
automatically_cross_build_packages
cross_build popt
# needed by newt
automatically_cross_build_packages
if test -f "$REPODIR/stamps/newt_1"; then
echo "skipping rebuild of newt stage1"
else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment