From: Peter Michael Green <plugwash@raspbian.org>
Date: Tue, 25 Jun 2024 16:03:32 +0000 (+0000)
Subject: Manual merge of version 0.19.0+ds-3+rpi1 and 0.19.0+ds-5 to produce 0.19.0+ds-5+rpi1
X-Git-Tag: archive/raspbian/0.19.0+ds-5+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3415c9a51d6363a5c33abbe7809e2e77c0f1161a;p=merkaartor.git

Manual merge of version 0.19.0+ds-3+rpi1 and 0.19.0+ds-5 to produce 0.19.0+ds-5+rpi1
---

3415c9a51d6363a5c33abbe7809e2e77c0f1161a
diff --cc debian/changelog
index 0354cf4,ce5d63d..128b15f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,38 +1,45 @@@
- merkaartor (0.19.0+ds-3+rpi1) bookworm-staging; urgency=medium
++merkaartor (0.19.0+ds-5+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 0.19.0+ds-2+rpi1 by root <Peter Michael Green <plugwash@raspbian.org> at Tue, 14 Sep 2021 15:50:33 +0000]
 +  * Remove armhf from qtwebengine architecture lists.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 13 Feb 2023 21:45:01 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 25 Jun 2024 16:02:40 +0000
++
+ merkaartor (0.19.0+ds-5) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Bas Couwenberg ]
+   * Use execute_after instead of override in rules file.
+   * Enable Salsa CI.
+   * Drop unused libspatialite-dev build dependency.
+   * Replace pkg-config build dependency with pkgconf.
+   * Add patch to fix FTBFS with libproxy 0.5.
+     (closes: #1066442)
+   * Switch from qmake to cmake.
+   * Update lintian overrides.
+ 
+   [ Pino Toscano ]
+   * Backport upstream commit ba8b73e6b3372a21305640baca07a991f77db119 and
+     commit 1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd to build also with Exiv2
+     0.28+; patches upstream_Moved-exiv2-header-from-GeoImageDock.h-to-.cpp.patch
+     and upstream_Replaced-use-of-AutoPtr-with-std-unique_ptr-in-GeoIm.patch.
+ 
+  -- Bas Couwenberg <sebastic@debian.org>  Wed, 13 Mar 2024 15:22:13 +0100
+ 
+ merkaartor (0.19.0+ds-4) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Bas Couwenberg ]
+   * Bump Standards-Version to 4.6.2, no changes.
+   * Don't use qtwebengine5-dev on mipsel, package to be removed.
+   * Update lintian overrides.
+ 
+   [ Adrian Bunk ]
+   * qtwebengine5-dev is now available on mips64el
+ 
+  -- Bas Couwenberg <sebastic@debian.org>  Tue, 25 Jul 2023 09:31:25 +0200
  
  merkaartor (0.19.0+ds-3) unstable; urgency=medium
  
diff --cc debian/control
index 518d081,db21f7f..1b40798
--- a/debian/control
+++ b/debian/control
@@@ -14,18 -15,17 +15,17 @@@ Build-Depends: cmake
                 libproxy-dev,
                 libqt5svg5-dev,
                 libquazip5-dev,
-                libspatialite-dev,
                 libxml2-dev,
                 libxslt1-dev,
-                pkg-config,
-                qt5-qmake,
-                qt5-qmake:native,
+                pkgconf,
                 qtbase5-dev,
-                qttools5-dev-tools,
-                qtwebengine5-dev [amd64 arm64 i386 mipsel],
+                qttools5-dev,
 -               qtwebengine5-dev [amd64 arm64 armhf i386 mips64el],
++               qtwebengine5-dev [amd64 arm64 i386 mips64el],
                 sharutils,
+                xauth,
+                xvfb,
                 zlib1g-dev
- Standards-Version: 4.6.1
+ Standards-Version: 4.6.2
  Vcs-Browser: https://salsa.debian.org/debian-gis-team/merkaartor
  Vcs-Git: https://salsa.debian.org/debian-gis-team/merkaartor.git
  Homepage: http://www.merkaartor.be/
diff --cc debian/rules
index 14cba67,34e2bda..3ec3b9b
--- a/debian/rules
+++ b/debian/rules
@@@ -11,10 -11,10 +11,10 @@@ export QT_SELECT=
  
  DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
  
- ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 i386 mipsel))
- DEB_PKG_USEWEBENGINE=1
 -ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386 mips64el))
++ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 i386 mips64el))
+ DEB_PKG_WEBENGINE=1
  else
- DEB_PKG_USEWEBENGINE=0
+ DEB_PKG_WEBENGINE=0
  endif