Merge version 5.62.0-3+rpi1 and 5.70.0-1 to produce 5.70.0-1+rpi1 archive/raspbian/5.70.0-1+rpi1 raspbian/5.70.0-1+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Sun, 7 Jun 2020 20:47:30 +0000 (21:47 +0100)
committerRaspbian automatic forward porter <root@raspbian.org>
Sun, 7 Jun 2020 20:47:30 +0000 (21:47 +0100)
1  2 
debian/changelog
debian/rules

index e37b9f6518da5e4b626dcbfdab0aafd022b8ebfc,1d05ba65b7ad83e7279a5f8a1760ddb875c51e8d..68c9b7b32fe17685ba278ad3c34346d78d957551
@@@ -1,8 -1,31 +1,38 @@@
- ksyntax-highlighting (5.62.0-3+rpi1) bullseye-staging; urgency=medium
++ksyntax-highlighting (5.70.0-1+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 5.62.0-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 25 Feb 2020 04:12:28 +0000]
 +  * Add symbols file hack for raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 25 Feb 2020 04:12:28 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 07 Jun 2020 20:47:30 +0000
++
+ ksyntax-highlighting (5.70.0-1) unstable; urgency=medium
+   * Team upload.
+   [ Sandro Knauß ]
+   * Bump compat level to 13.
+   * New upstream release (5.70.0).
+   * Update build-deps and deps with the info from cmake.
+   * Set field Upstream-Contact in debian/copyright.
+   * Remove obsolete field Contact from debian/upstream/metadata (already
+     present in machine-readable debian/copyright).
+  -- Sandro Knauß <hefee@debian.org>  Tue, 26 May 2020 23:56:35 +0200
+ ksyntax-highlighting (5.69.0-1) experimental; urgency=medium
+   * Team upload.
+   [ Sandro Knauß ]
+   * Add Rules-Requires-Root field to control.
+   * New upstream release (5.69.0).
+   * Update build-deps and deps with the info from cmake.
+   * Enable hardening all.
+   * Update copyright file.
+   * Update qtlogging categories files.
+   * Remove not needed injection of linker flags.
+  -- Sandro Knauß <hefee@debian.org>  Thu, 30 Apr 2020 00:58:50 +0200
  
  ksyntax-highlighting (5.62.0-3) unstable; urgency=medium
  
diff --cc debian/rules
Simple merge