Merge version 5.94.0-1+rpi1 and 5.94.0-3 to produce 5.94.0-3+rpi1 archive/raspbian/5.94.0-3+rpi1 raspbian/5.94.0-3+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Fri, 29 Jul 2022 12:44:02 +0000 (13:44 +0100)
committerRaspbian automatic forward porter <root@raspbian.org>
Fri, 29 Jul 2022 12:44:02 +0000 (13:44 +0100)
1  2 
debian/changelog
debian/rules

index 8c3384f40cbcdce3ce6794e8487da151550be636,19165a3b44ec275752e0c67c7e94ff240aed8da8..7d7929e0a66b7493d639bf8be9175565fa921ab0
@@@ -1,9 -1,23 +1,30 @@@
- kactivities-kf5 (5.94.0-1+rpi1) bookworm-staging; urgency=medium
++kactivities-kf5 (5.94.0-3+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 5.12.0-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 19 Jul 2015 21:22:27 +0000]
 +  * Add symbols file hack for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 28 May 2022 16:34:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 29 Jul 2022 12:44:01 +0000
++
+ kactivities-kf5 (5.94.0-3) unstable; urgency=medium
+   * Team upload.
+   * Update symbols files from the logs of buildds.
+  -- Pino Toscano <pino@debian.org>  Mon, 25 Jul 2022 20:55:28 +0200
+ kactivities-kf5 (5.94.0-2) unstable; urgency=medium
+   * Team upload.
+   * Bump Standards-Version to 4.6.1, no changes required.
+   * Remove inactive Uploaders.
+   * Modernize building:
+     - add the dh-sequence-kf5 build dependency to use the kf5 addon
+       automatically
+     - drop all the manually specified addons and buildsystem for dh
+   * CI: enable again the blhc job.
+   * Update symbols file. (Closes: #1012955)
+  -- Pino Toscano <pino@debian.org>  Sat, 23 Jul 2022 12:09:49 +0200
  
  kactivities-kf5 (5.94.0-1) unstable; urgency=medium
  
diff --cc debian/rules
index dc4c915665923df20b1f8ac33bce1552e6752bb8,339d17af2cccbd4de8f08e70a2f2a234b6bcec76..07cdae2457772e417c63d571f8cd5717d56d3277
@@@ -4,15 -4,7 +4,15 @@@
  export DEB_BUILD_MAINT_OPTIONS = hardening=+all
  
  %:
-       dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
+       dh $@ --with pkgkde_symbolshelper
  
 +override_dh_auto_build:
 +      sed -i s/arch=!armel/optional=meh/ debian/libkf5activities5.symbols 
 +      dh_auto_build
 +
 +override_dh_auto_clean:
 +      dh_auto_clean
 +      sed -i s/optional=meh/arch=!armel/ debian/libkf5activities5.symbols 
 +
  override_dh_auto_configure:
        dh_auto_configure -- -DBUILD_QCH=ON