Merge version 5.102.0-1+rpi1 and 5.103.0-2 to produce 5.103.0-2+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Sat, 25 Feb 2023 19:19:44 +0000 (19:19 +0000)
committerRaspbian automatic forward porter <root@raspbian.org>
Sat, 25 Feb 2023 19:19:44 +0000 (19:19 +0000)
1  2 
debian/changelog
debian/rules

index 30aef021db20d2c2887e457415de99ab55087426,baa2bdcfd294ee935e0023b244e730d5f131dbcb..72edd702cf34c0e92f900046279f0bc0d34075e8
@@@ -1,9 -1,29 +1,36 @@@
- ksyntax-highlighting (5.102.0-1+rpi1) bookworm-staging; urgency=medium
++ksyntax-highlighting (5.103.0-2+rpi1) bookworm-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 30 Jan 2023 04:03:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 25 Feb 2023 19:19:44 +0000
++
+ ksyntax-highlighting (5.103.0-2) unstable; urgency=medium
+   * Team upload.
+   * Remove inactive Uploaders.
+   * Modernize building:
+     - add the dh-sequence-kf5 build dependency to use the kf5 addon
+       automatically
+     - add the dh-sequence-pkgkde-symbolshelper build dependency to use the
+       pkgkde_symbolshelper automatically
+     - drop the pkg-kde-tools build dependency, no more explicitly needed
+     - drop all the manually specified addons and buildsystem for dh
+   * Remove breaks/replaces for existing packages with versions older than
+     oldstable.
+   * Make sure to link with atomic on architectures that need it, i.e.
+     armel m68k mipsel sh4.
+   * Update symbols files from the logs of buildds.
+  -- Pino Toscano <pino@debian.org>  Tue, 14 Feb 2023 08:36:41 +0100
+ ksyntax-highlighting (5.103.0-1) unstable; urgency=medium
+   [ AurĂ©lien COUDERC ]
+   * New upstream release (5.103.0).
+   * Update build-deps and deps with the info from cmake.
+  -- AurĂ©lien COUDERC <coucouf@debian.org>  Sun, 12 Feb 2023 21:44:25 +0100
  
  ksyntax-highlighting (5.102.0-1) unstable; urgency=medium
  
diff --cc debian/rules
index 8ecf935d003fa7e1e2d98f4115a0a73407bfd7b8,d7aa2eafbd26260478a87fd39dc631d44711dd9f..4e4bc49d767a55c5a100803bae6fc50d68345e3e
@@@ -3,13 -3,13 +3,18 @@@
  
  export DEB_BUILD_MAINT_OPTIONS = hardening=+all
  
+ archs_that_need_atomic = armel m68k mipsel sh4
+ ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(archs_that_need_atomic)))
+ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-as-needed -latomic -Wl,--as-needed
+ endif
  %:
-       dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
+       dh $@
  
  override_dh_auto_configure:
 +      sed -i 's/(arch=!armel !riscv64)/(optional=notarmelandprobabllynotraspbian)/' debian/libkf5syntaxhighlighting5.symbols
        dh_auto_configure -- -DBUILD_QCH=ON -DKF5_HOST_TOOLING=/usr/lib
 +
 +override_dh_auto_clean:
 +      dh_auto_clean
 +      sed -i 's/(optional=notarmelandprobabllynotraspbian)/(arch=!armel !riscv64)/' debian/libkf5syntaxhighlighting5.symbols