From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 19 Jan 2020 14:01:26 +0000 (+0000)
Subject: Merge version 1:0.13.1-1+rpi1 and 1:0.13.1-2 to produce 1:0.13.1-2+rpi1
X-Git-Tag: archive/raspbian/1%0.13.1-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=505bc1f83db76162bc6993af0a96efdcda035558;p=quassel.git

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

505bc1f83db76162bc6993af0a96efdcda035558
diff --cc debian/changelog
index 2b8a941,65c1538..3a987ce
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,21 @@@
- quassel (1:0.13.1-1+rpi1) buster-staging; urgency=medium
++quassel (1:0.13.1-2+rpi1) bullseye-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>  Thu, 28 Feb 2019 17:23:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 19 Jan 2020 14:01:26 +0000
++
+ quassel (1:0.13.1-2) unstable; urgency=medium
+ 
+   [ Felix Geyer ]
+   * Fix quasselcore AppArmor denials when the config is saved. (Closes:
+     #940482)
+ 
+   [ Scott Kitterman ]
+   * Correct default channel for Debian
+   * Add NEWS entry about reloading the quaseelcore AppArmor profile
+ 
+  -- Scott Kitterman <scott@kitterman.com>  Sat, 11 Jan 2020 15:00:28 -0500
  
  quassel (1:0.13.1-1) unstable; urgency=medium