From: Raspbian automatic forward porter <root@raspbian.org>
Date: Tue, 1 Oct 2024 10:37:42 +0000 (+0100)
Subject: Merge version 1:0.14.0-1+rpi1 and 1:0.14.0-2 to produce 1:0.14.0-2+rpi1
X-Git-Tag: archive/raspbian/1%0.14.0-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2ae8e1efe81dd0c52027606f6bc485db93d99b3b;p=quassel.git

Merge version 1:0.14.0-1+rpi1 and 1:0.14.0-2 to produce 1:0.14.0-2+rpi1
---

2ae8e1efe81dd0c52027606f6bc485db93d99b3b
diff --cc debian/changelog
index df7cf08,804e2b3..956cc7a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,40 +1,47 @@@
- quassel (1:0.14.0-1+rpi1) bookworm-staging; urgency=medium
++quassel (1:0.14.0-2+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1:0.12.5-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 18 Oct 2018 22:15:29 +0000]
 +  * Remove armhf from qtwebengine architecture list.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 26 Jan 2022 08:41:39 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Oct 2024 10:37:41 +0000
++
+ quassel (1:0.14.0-2) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Christian Göttsche ]
+   * Update blhc configuration
+ 
+   [ Debian Janitor ]
+   * Trim trailing whitespace.
+   * Bump debhelper from old 12 to 13.
+     + debian/rules: Drop --fail-missing argument to dh_missing, which is now the
+       default.
+   * Fix day-of-week for changelog entries 0.5.1-2, 0.3.1+dfsg-2, 0.3.1+dfsg-1.
+   * Update standards version to 4.6.1, no changes needed.
+   * Avoid explicitly specifying -Wl,--as-needed linker flag.
+ 
+   [ Adrian Bunk ]
+   * qtwebengine5-dev is now available on mips64el.
+ 
+   [ Pino Toscano ]
+   * Update standards version to 4.6.2, no changes needed.
+   * Drop patch 02_script_interpreter_path.patch, as now dh_perl rewrites perl
+     shebangs.
+   * Stop using qtwebengine5-dev on mipsel, as it will be removed soon from
+     that architecture.
+   * Switch the list of architectures for libqt5webkit5-dev to be a negated
+     version of the ones for qtwebengine5-dev, so it is easier to maintain.
+   * Remove inactive Uploaders.
+   * Drop the obsolete lsb-base dependency.
+   * Use chrpath to drop the extra RPATH set in binaries.
+   * Remove the custom inxi script directly during dh_auto_install, rather than
+     with extra checks during dh_install.
+   * Use execute_after_dh_install to avoid invoking dh_install manually.
+   * Use the ${perl:Depends} substvar in quassel-data.
+   * CI: do not consider lintian warnings as fatal.
+ 
+  -- Pino Toscano <pino@debian.org>  Sat, 22 Jul 2023 09:18:22 +0200
  
  quassel (1:0.14.0-1) unstable; urgency=medium
  
diff --cc debian/control
index ef583c0,6822df7..c8c8994
--- a/debian/control
+++ b/debian/control
@@@ -19,8 -18,8 +18,8 @@@ Build-Depends: debhelper-compat (= 13)
                 libphonon4qt5-dev,
                 libphonon4qt5experimental-dev,
                 libdbusmenu-qt5-dev,
-                qtwebengine5-dev[amd64 arm64 i386 mipsel],
-                libqt5webkit5-dev [armel hurd-i386 mips mips64el ppc64el s390x],
 -               qtwebengine5-dev [amd64 arm64 armhf i386 mips64el],
++               qtwebengine5-dev [amd64 arm64 i386 mips64el],
+                libqt5webkit5-dev [!amd64 !arm64 !armhf !i386 !mips64el],
                 extra-cmake-modules,
                 libkf5textwidgets-dev,
                 libkf5coreaddons-dev,