[neon/backports-noble/pcre2-noble/Neon/release] debian: align with upstream multiarch changes
Carlos De Maine
null at kde.org
Wed Sep 16 03:08:32 BST 2026
Git commit c07178b599244f33352d159ee93ce6ba533cae46 by Carlos De Maine.
Committed on 16/09/2026 at 02:08.
Pushed by carlosdem into branch 'Neon/release'.
align with upstream multiarch changes
D +0 -1 debian/compat
M +1 -1 debian/control
A +2 -0 debian/not-installed
M +2 -12 debian/rules
https://invent.kde.org/neon/backports-noble/pcre2-noble/-/commit/c07178b599244f33352d159ee93ce6ba533cae46
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index 16e1634..362c3da 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
XSBC-Original-Maintainer: Matthew Vernon <matthew at debian.org>
Standards-Version: 4.5.1
-Build-Depends: debhelper (>=9), dpkg-dev (>= 1.16.1~), dh-autoreconf
+Build-Depends: debhelper-compat (=13), dpkg-dev (>= 1.16.1~),
Vcs-Git: https://salsa.debian.org/debian/pcre2.git
Vcs-Browser: https://salsa.debian.org/debian/pcre2
Homepage: https://github.com/PCRE2Project/pcre2
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..a87984c
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,2 @@
+/usr/lib/*/libpcre2*.la
+/usr/share/doc/pcre2/*
diff --git a/debian/rules b/debian/rules
index 03c44b6..7a01f62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,10 +10,6 @@ include /usr/share/dpkg/default.mk
# ones in libc.
export DEB_CFLAGS_MAINT_APPEND = -Dregcomp=PCRE2regcomp -Dregexec=PCRE2regexec -Dregerror=PCRE2regerror -Dregfree=PCRE2regfree
-ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-export CC=i686-linux-gnu-gcc
-deb_maint_conf_args +=--build=x86_64-pc-linux-gnu --host=i686-pc-linux-gnu
-endif
deb_maint_conf_args = --enable-pcre2-16 --enable-pcre2-32 --disable-pcre2grep-callout
#enable JIT only on architectures that support it (see pcre2jit.3)
@@ -24,7 +20,7 @@ deb_maint_conf_args +=--disable-jit
endif
%:
- dh $@ --parallel --with autoreconf
+ dh $@
override_dh_auto_configure:
dh_auto_configure -- $(deb_maint_conf_args)
@@ -33,10 +29,4 @@ override_dh_makeshlibs:
dh_makeshlibs -V --add-udeb=libpcre2-8-0-udeb
override_dh_strip:
- dh_strip --dbgsym-migration='libpcre2-dbg (<< 10.45-1~)'
-
-ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-override_dh_shlibdeps:
- dh_shlibdeps -l/lib/${DEB_TARGET_MULTIARCH}:/usr/lib/${DEB_TARGET_MULTIARCH}:/usr/i686-linux-gnu/lib
-endif
-
+ dh_strip --dbgsym-migration='libpcre2-dbg (<< 10.34-2~)'
More information about the Neon-commits
mailing list