Merge version 4:5.19.5-4+rpi1 and 4:5.20.4-2 to produce 4:5.20.4-2+rpi1 archive/raspbian/4%5.20.4-2+rpi1 raspbian/4%5.20.4-2+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Fri, 25 Dec 2020 02:58:19 +0000 (02:58 +0000)
committerRaspbian automatic forward porter <root@raspbian.org>
Fri, 25 Dec 2020 02:58:19 +0000 (02:58 +0000)
1  2 
debian/changelog
debian/control

index f888373103b86fa4030f56dd269e80342b838122,9c9533bfadde01288799f0c053de2f373845abef..02a807786758129f49b70b3f0106c3eb579820b2
@@@ -1,9 -1,18 +1,25 @@@
- libksysguard (4:5.19.5-4+rpi1) bullseye-staging; urgency=medium
++libksysguard (4:5.20.4-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 4:5.17.5-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 17 Feb 2020 22:43:59 +0000]
 +  * Remove armhf from qtwebengine architecture list.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 13 Nov 2020 22:09:07 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 25 Dec 2020 02:58:19 +0000
++
+ libksysguard (4:5.20.4-2) unstable; urgency=medium
+   * Release to unstable.
+  -- Norbert Preining <norbert@preining.info>  Tue, 22 Dec 2020 11:04:37 +0900
+ libksysguard (4:5.20.4-1) experimental; urgency=medium
+   [ Norbert Preining ]
+   * New upstream release (5.20.4).
+   * Update build-deps with the info from cmake.
+   * Update list of installed files.
+   * Update symbols.
+  -- Norbert Preining <norbert@preining.info>  Wed, 09 Dec 2020 14:17:32 +0900
  
  libksysguard (4:5.19.5-4) unstable; urgency=medium
  
diff --cc debian/control
index da3a213591bc01d9c1e94689e5df1d8073c7df22,9c8988486481679906e38bceb72f140912641f65..753dbbe8688c9c341b47db328a2474a7ceed9b8e
@@@ -30,9 -30,10 +30,10 @@@ Build-Depends: cmake (>= 3.0~)
                 libx11-dev,
                 libxres-dev,
                 pkg-kde-tools (>= 0.15.18~),
-                qtbase5-dev (>= 5.14.0~),
-                qtscript5-dev (>= 5.14.0~),
-                qtwebengine5-dev (>= 5.14.0~) [amd64 arm64 i386 mipsel],
+                qtbase5-dev (>= 5.15.0~),
+                qtscript5-dev (>= 5.15.0~),
+                qttools5-dev (>= 5.15.0~),
 -               qtwebengine5-dev (>= 5.15.0~) [amd64 arm64 armhf i386 mipsel],
++               qtwebengine5-dev (>= 5.15.0~) [amd64 arm64 i386 mipsel],
                 xauth,
                 xvfb,
                 zlib1g-dev,