Merge version 1:0.13.1-3+rpi1 and 1:0.13.1-4 to produce 1:0.13.1-4+rpi1 archive/raspbian/1%0.13.1-4+rpi1 raspbian/1%0.13.1-4+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Fri, 24 Jul 2020 07:07:29 +0000 (08:07 +0100)
committerRaspbian automatic forward porter <root@raspbian.org>
Fri, 24 Jul 2020 07:07:29 +0000 (08:07 +0100)
1  2 
debian/changelog
debian/control

index 869f87b553e140ea4ba1e7abe78ead6fbc6c6bf2,b39531e4ab670b0dddb4bceae27cd4ae3f000ecf..e49b4f0c552540f7f1b106b7391a9807e8e96404
@@@ -1,9 -1,16 +1,23 @@@
- quassel (1:0.13.1-3+rpi1) bullseye-staging; urgency=medium
++quassel (1:0.13.1-4+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>  Tue, 28 Jan 2020 20:04:24 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 24 Jul 2020 07:07:29 +0000
++
+ quassel (1:0.13.1-4) unstable; urgency=medium
+   [ Scott Kitterman ]
+   * Add explicit build-depeds on debhelper (>= 10.3~) since we use dh_missing
+   * Bump standards-version to 4.5.0 without further change
+   * Add Recommends: ca-certificates to quassel and quassel-client so network
+     certificates can be verified
+   [ Felix Geyer ]
+   * Add patches to fix building against Qt 5.14 from Ubuntu.
+     Thanks Dan Streetman! (Closes: #964687)
+  -- Felix Geyer <fgeyer@debian.org>  Mon, 13 Jul 2020 23:13:31 +0200
  
  quassel (1:0.13.1-3) unstable; urgency=medium
  
diff --cc debian/control
Simple merge