extend symbols file hack to cover qt6 packages.

diff --git a/debian/changelog b/debian/changelog
index 4e60358d69666358cc2644a6f6f9e03ac8b99afd..e2aa7eeef95f17931e12949f96c78114e3381e55 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,10 @@ qscintilla2 (2.13.3+dfsg-3+rpi1) bookworm-staging; urgency=medium
   [changes brought forward from 2.10.2+dfsg-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 11 Jan 2018 16:07:42 +0000]
   * Add symbols file hack for Raspbian.
 
- -- Raspbian forward porter <root@raspbian.org>  Sat, 07 Jan 2023 13:44:45 +0000
+  [changes introduced in 2.13.3+dfsg-3+rpi1 by Peter Michael Green]
+  * Extend symbols file hack to cover qt6 packages.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Jan 2023 11:00:18 +0000
 
 qscintilla2 (2.13.3+dfsg-3) unstable; urgency=medium
 

diff --git a/debian/rules b/debian/rules
index 5021d8a87dd3e75ee1dca3daee44b76b0a9fe3bf..2690a84d728f40d7d72c3c33bd02903cd2538660 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -26,9 +26,9 @@ endif
 
 configure-stamp:
        dh_testdir
-       sed -i 's/(arch=armel)/(optional=meh)/' debian/libqscintilla2-qt5-*.symbols
-       sed -i 's/(arch=!armel)/(optional=meh2)/' debian/libqscintilla2-qt5-*.symbols
-       sed -i 's/(arch=!armel !riscv64)/(optional=meh3)/' debian/libqscintilla2-qt5-*.symbols
+       sed -i 's/(arch=armel)/(optional=meh)/' debian/libqscintilla2-qt?-*.symbols
+       sed -i 's/(arch=!armel)/(optional=meh2)/' debian/libqscintilla2-qt?-*.symbols
+       sed -i 's/(arch=!armel !riscv64)/(optional=meh3)/' debian/libqscintilla2-qt?-*.symbols
        # Configuring for Qt5 support
        mkdir -p QSciQt5
        cp -r src/* QSciQt5
@@ -130,6 +130,6 @@ override_dh_strip:
 
 override_dh_auto_clean:
        dh_auto_clean
-       sed -i 's/(optional=meh)/(arch=armel)/' debian/libqscintilla2-qt5-*.symbols
-       sed -i 's/(optional=meh2)/(arch=!armel)/' debian/libqscintilla2-qt5-*.symbols
-       sed -i 's/(optional=meh3)/(arch=!armel !riscv64)/' debian/libqscintilla2-qt5-*.symbols
+       sed -i 's/(optional=meh)/(arch=armel)/' debian/libqscintilla2-qt?-*.symbols
+       sed -i 's/(optional=meh2)/(arch=!armel)/' debian/libqscintilla2-qt?-*.symbols
+       sed -i 's/(optional=meh3)/(arch=!armel !riscv64)/' debian/libqscintilla2-qt?-*.symbols