From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 2 Nov 2023 17:42:48 +0000 (+0000)
Subject: Merge version 4:22.12.3-1+rpi1 and 4:22.12.3-2 to produce 4:22.12.3-2+rpi1
X-Git-Tag: raspbian/4%22.12.3-2+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dc0e59956723c4dec63bd23b3c2f023fc86102b0;p=marble.git

Merge version 4:22.12.3-1+rpi1 and 4:22.12.3-2 to produce 4:22.12.3-2+rpi1
---

d610aea62f37ac6b6aae46c7f1dd5364fa2f505b
diff --cc debian/changelog
index d2dd56d,768649f..8e69f1c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,13 +1,27 @@@
- marble (4:22.12.3-1+rpi1) bookworm-staging; urgency=medium
++marble (4:22.12.3-2+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 4:22.08.3-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 08 Dec 2022 15:44:12 +0000]
 +  * Remove armhf from qtwebengine architecture list.
 +
 +  [changes introduced in 4:22.12.0-2+rpi1 by Peter Michael Green]
 +  * Update symbols file for raspbian.
 +
 +  [changes brought forward from 4:22.12.0-2+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sat, 07 Jan 2023 16:40:02 +0000]
 +  * Remove armhf from qtwebengine architecture list in libmarble-dev
 +    dependencies.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 12 Mar 2023 11:17:27 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Nov 2023 17:42:46 +0000
++
+ marble (4:22.12.3-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Stop using qtwebengine5-dev on mipsel, as it will be removed soon from
+     that architecture.
+   * Trim trailing whitespace.
+   * Remove an obsolete maintscript entry.
+   * Re-export upstream signing key without extra signatures.
+ 
+  -- Pino Toscano <pino@debian.org>  Mon, 17 Jul 2023 07:28:54 +0200
  
  marble (4:22.12.3-1) unstable; urgency=medium
  
diff --cc debian/control
index ab89482,343fc2e..d955279
--- a/debian/control
+++ b/debian/control
@@@ -38,7 -38,7 +38,7 @@@ Build-Depends: cmake (>= 3.16~)
                 qtpositioning5-dev (>= 5.14.0~),
                 qtquickcontrols2-5-dev (>= 5.14.0~),
                 qttools5-dev (>= 5.14.0~),
-                qtwebengine5-dev (>= 5.14.0~) [amd64 arm64 i386 mips64el mipsel],
 -               qtwebengine5-dev (>= 5.14.0~) [amd64 arm64 armhf i386 mips64el],
++               qtwebengine5-dev (>= 5.14.0~) [amd64 arm64 i386 mips64el],
                 shared-mime-info,
                 zlib1g-dev,
  Standards-Version: 4.6.2
@@@ -87,7 -87,7 +87,7 @@@ Depends: libastro-dev (= ${binary:Versi
           libqt5svg5-dev (>= 5.14.0~),
           libqt5webkit5-dev (>= 5.4),
           qtdeclarative5-dev (>= 5.14.0~),
-          qtwebengine5-dev (>= 5.14.0~) [amd64 arm64 i386 mips64el mipsel],
 -         qtwebengine5-dev (>= 5.14.0~) [amd64 arm64 armhf i386 mips64el],
++         qtwebengine5-dev (>= 5.14.0~) [amd64 arm64 i386 mips64el],
           ${misc:Depends},
           ${sameVersionDep:qtbase5-dev:libmarblewidget-qt5-28},
           ${shlibs:Depends},