From: Raspbian forward pporter <root@raspbian.org>
Date: Tue, 11 Dec 2018 03:25:41 +0000 (+0000)
Subject: Merge version 1:0.12.5-3+rpi1 and 1:0.13.0-2 to produce 1:0.13.0-2+rpi1
X-Git-Tag: archive/raspbian/1%0.13.0-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5d2a2275344a22c4b72f5847bba6d30e9f588cf1;p=quassel.git

Merge version 1:0.12.5-3+rpi1 and 1:0.13.0-2 to produce 1:0.13.0-2+rpi1
---

5d2a2275344a22c4b72f5847bba6d30e9f588cf1
diff --cc debian/changelog
index a6531ad,887394f..9ee60f5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,35 +1,42 @@@
- quassel (1:0.12.5-3+rpi1) buster-staging; urgency=medium
++quassel (1:0.13.0-2+rpi1) buster-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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 18 Oct 2018 22:15:29 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 11 Dec 2018 03:25:40 +0000
++
+ quassel (1:0.13.0-2) unstable; urgency=medium
+ 
+   * Upload to unstable
+   * Set -DWITH_OXYGEN_ICONS for compatibility for Oxygen users
+   * Add oxygen-icon-theme as an alternative Recommends to breeze-icon-theme
+   * Make debian/NEWS specific to quassel-core and quassel binaries
+ 
+  -- Scott Kitterman <scott@kitterman.com>  Wed, 05 Dec 2018 00:34:55 -0500
+ 
+ quassel (1:0.13.0-1) experimental; urgency=medium
+ 
+   * New upstream release (Closes: #915244)
+     - Delete debian/patches/03_force_icon_theme.patch, fixed upstream
+     - Refresh remaining patch
+   * Add libqt5webkit5-dev to build depends for archs where qtwebengine5-dev is
+     not available and update the qtwebengine5-dev arch list
+   * Set web backend during configure in debian/rules (Thanks to Michael
+     Marley)
+   * Update debian/copyright
+   * Add debian/NEWS item suggesting a backup of the database
+   * Add debian/patches/02_script_interpreter_path.patch to use correct path in
+     scripts
+   * Bump standards-vertion to 4.2.1 without further change
+   * Add qtmultimedia5-dev to build-depends
+   * Update debian/patches/01_default_network_channel.patch to connect via SSL
+     (TLS) when possible
+   * Add symlink to usr/bin/mpris-quassel from usr/share/quassel/scripts/mpris
+     so the script is available on the system path
+   * Change recommended icon theme to breeze-icon-theme to match Plasma default
+   * Include quassel unique icons for breeze and breeze-dark icon themes
+ 
+  -- Scott Kitterman <scott@kitterman.com>  Mon, 03 Dec 2018 17:27:44 -0500
  
  quassel (1:0.12.5-3) unstable; urgency=medium
  
diff --cc debian/control
index 7ccaf6c,a86ab0f..50f349c
--- a/debian/control
+++ b/debian/control
@@@ -15,7 -16,8 +16,8 @@@ Build-Depends: debhelper (>= 10~)
                 libphonon4qt5-dev,
                 libphonon4qt5experimental-dev,
                 libdbusmenu-qt5-dev,
-                qtwebengine5-dev [amd64 arm64 i386],
 -               qtwebengine5-dev [amd64 arm64 armhf i386 mipsel],
++               qtwebengine5-dev[amd64 arm64 i386 mipsel],
+                libqt5webkit5-dev [armel mips mips64el ppc64el s390x],
                 extra-cmake-modules,
                 libkf5textwidgets-dev,
                 libkf5coreaddons-dev,