From: Peter Michael Green <plugwash@raspbian.org>
Date: Wed, 2 Dec 2020 00:25:31 +0000 (+0000)
Subject: Manual merge of version 17.3-1+rpi1 and 18.3-1 to produce 18.3-1+rpi1
X-Git-Tag: archive/raspbian/18.3-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=49bad5362caa3cfd6995a0e6e642f9e532206510;p=pentobi.git

Manual merge of version 17.3-1+rpi1 and 18.3-1 to produce 18.3-1+rpi1
---

49bad5362caa3cfd6995a0e6e642f9e532206510
diff --cc debian/changelog
index 41ea570,4c5a5e0..55e0f3c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,23 +1,31 @@@
- pentobi (17.3-1+rpi1) bullseye-staging; urgency=medium
++pentobi (18.3-1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 16.2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 13 Jul 2019 13:40:59 +0000]
 +  * Remove armhf from qtwebview (qtwebengine) architecture list because we
 +    don't have qtwebengine in raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 22 Dec 2019 03:13:11 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 01 Dec 2020 22:33:59 +0000
++
+ pentobi (18.3-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     - Fixes compilation with Qt 5.15 (Closes: #975128).
+   * d/control:
+     - Use debhelper compatibility level v13.
+     - Remove Dean Evans from uploaders because of long inactivity.
+       Thank you for your contribution as the initial maintainer!
+     - Bump Standards-Version to 4.5.1. No changes needed.
+     - Add libqt5svg5 to Depends, required for SVG images (Closes: #975314).
+     - Depend on qml-module-qtqml just to avoid issues with Qt 5.14 and earlier
+       (Closes: #973855).
+   * d/copyright:
+     - Update years.
+     - Change Upstream-Contact from the recently closed mailing list to
+       GitHub issue tracker.
+   * d/rules: Drop the custom linker flag -Wl,--as-needed which is not
+     necessary anymore after becoming the default.
+ 
+  -- Juhani Numminen <juhaninumminen0@gmail.com>  Fri, 20 Nov 2020 17:04:16 +0200
  
  pentobi (17.3-1) unstable; urgency=medium
  
diff --cc debian/rules
index 79ff822,6132bf5..0832532
--- a/debian/rules
+++ b/debian/rules
@@@ -11,8 -10,9 +10,9 @@@ ifeq (,$(filter noopt,$(DEB_BUILD_OPTIO
    export DEB_CXXFLAGS_MAINT_APPEND = -O3
  endif
  
- # Use an external web browser where Qt5WebView is not available.
+ # List of architectures which have Qt5WebView.
 -WEBVIEW_ARCHS = amd64 arm64 armhf i386 mipsel
 +WEBVIEW_ARCHS = amd64 arm64 i386 mipsel
+ # Everywhere else, set a cmake flag to fall back to launching a web browser.
  ifeq (,$(filter $(WEBVIEW_ARCHS),$(DEB_HOST_ARCH)))
    WEBVIEW_FLAG = -DPENTOBI_OPEN_HELP_EXTERNALLY=ON
  endif