[Kst-plot/kst] 104bca: SVN_SILENT made messages (.desktop file) - always ...

netterfield noreply at github.com
Sun Feb 8 20:26:00 GMT 2026


  Branch: refs/heads/UBUNTU-NOBLE
  Home:   https://github.com/Kst-plot/kst
  Commit: 104bcac44c98932dbc55dc3c4499cb45fee2ec50
      https://github.com/Kst-plot/kst/commit/104bcac44c98932dbc55dc3c4499cb45fee2ec50
  Author: l10n daemon script <scripty at kde.org>
  Date:   2026-02-07 (Sat, 07 Feb 2026)

  Changed paths:
    M src/kst/org.kde.kst.desktop

  Log Message:
  -----------
  SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"


  Commit: 5e5b880b389eef0fec0806d2b4dd984a3f128b8e
      https://github.com/Kst-plot/kst/commit/5e5b880b389eef0fec0806d2b4dd984a3f128b8e
  Author: Barth Netterfield <barth.netterfield at utoronto.ca>
  Date:   2026-02-07 (Sat, 07 Feb 2026)

  Changed paths:
    M src/kst/org.kde.kst.desktop

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: d9ae1f2c76a500063c40b74a9d701d445dc49427
      https://github.com/Kst-plot/kst/commit/d9ae1f2c76a500063c40b74a9d701d445dc49427
  Author: Barth Netterfield <barth.netterfield at utoronto.ca>
  Date:   2026-02-07 (Sat, 07 Feb 2026)

  Changed paths:
    R debian/changelog
    R debian/control
    R debian/copyright
    R debian/examples/README
    R debian/examples/example.kst
    R debian/examples/y.dat
    R debian/examples/yn.dat
    R debian/kst-doc.doc-base
    R debian/kst-doc.examples
    R debian/kst-doc.install
    R debian/kst.install
    R debian/not-installed
    R debian/patches/desktop-entry-contains-encoding-key.diff
    R debian/patches/desktop-entry-lacks-main-category.diff
    R debian/patches/fix-qreal-vs-double-for-arm.diff
    R debian/patches/hyphen-used-as-minus-sign.diff
    R debian/patches/series
    R debian/rules
    R debian/source/format
    R debian/watch
    M src/libkst/sharedptr.h

  Log Message:
  -----------
  remove debian from master.  debian lives in branches.


  Commit: bc8360064a4f6ac3b04e393fd502fef27e46b842
      https://github.com/Kst-plot/kst/commit/bc8360064a4f6ac3b04e393fd502fef27e46b842
  Author: l10n daemon script <scripty at kde.org>
  Date:   2026-02-08 (Sun, 08 Feb 2026)

  Changed paths:
    M src/kst/org.kde.kst.desktop

  Log Message:
  -----------
  SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"


  Commit: f06fd54a003dadd1fb802fea01b9780ea3053fcb
      https://github.com/Kst-plot/kst/commit/f06fd54a003dadd1fb802fea01b9780ea3053fcb
  Author: Andreas Sturmlechner <asturm at gentoo.org>
  Date:   2026-02-08 (Sun, 08 Feb 2026)

  Changed paths:
    R config.h

  Log Message:
  -----------
  Drop superfluous config.h

It is generated from config.h.cmake instead.

Signed-off-by: Andreas Sturmlechner <asturm at gentoo.org>


  Commit: 9120a5796943f05049c005890b7c5da9bf1b66e7
      https://github.com/Kst-plot/kst/commit/9120a5796943f05049c005890b7c5da9bf1b66e7
  Author: Andreas Sturmlechner <asturm at gentoo.org>
  Date:   2026-02-08 (Sun, 08 Feb 2026)

  Changed paths:
    M cmake/config.h.cmake

  Log Message:
  -----------
  Drop unused KST_INSTALL_LIBDIR

Signed-off-by: Andreas Sturmlechner <asturm at gentoo.org>


  Commit: 463ff6d10927aaa273875667b10a5e2ee2091642
      https://github.com/Kst-plot/kst/commit/463ff6d10927aaa273875667b10a5e2ee2091642
  Author: Andreas Sturmlechner <asturm at gentoo.org>
  Date:   2026-02-08 (Sun, 08 Feb 2026)

  Changed paths:
    M CMakeLists.txt
    M src/kst/CMakeLists.txt

  Log Message:
  -----------
  Use GNUInstallDirs consistently

Fixes installing the binary in the first place.

Signed-off-by: Andreas Sturmlechner <asturm at gentoo.org>


  Commit: 866ceff744aa983600833709089b780ab08c5c09
      https://github.com/Kst-plot/kst/commit/866ceff744aa983600833709089b780ab08c5c09
  Author: Andreas Sturmlechner <asturm at gentoo.org>
  Date:   2026-02-08 (Sun, 08 Feb 2026)

  Changed paths:
    M src/kst/CMakeLists.txt

  Log Message:
  -----------
  Do not compress man pages

Let distributions handle that.

Signed-off-by: Andreas Sturmlechner <asturm at gentoo.org>


  Commit: 6150dc989ad525341550e73520b47548caf60fe8
      https://github.com/Kst-plot/kst/commit/6150dc989ad525341550e73520b47548caf60fe8
  Author: Andreas Sturmlechner <asturm at gentoo.org>
  Date:   2026-02-08 (Sun, 08 Feb 2026)

  Changed paths:
    M CMakeLists.txt

  Log Message:
  -----------
  Check Qt6LinguistTools_FOUND var and use qt_add_translations

This should fix CI for the moment, but there actually is no po subdir in git.

Signed-off-by: Andreas Sturmlechner <asturm at gentoo.org>


  Commit: 2da83bf81c8f9a089ef761eeb2fbf507f9cc2706
      https://github.com/Kst-plot/kst/commit/2da83bf81c8f9a089ef761eeb2fbf507f9cc2706
  Author: Andreas Sturmlechner <asturm at gentoo.org>
  Date:   2026-02-08 (Sun, 08 Feb 2026)

  Changed paths:
    M .gitlab-ci.yml
    M .kde-ci.yml

  Log Message:
  -----------
  Switch to linux-qt6 CI

Unrequire ECM, it is not used here.

Signed-off-by: Andreas Sturmlechner <asturm at gentoo.org>


  Commit: e4dbcc472348100e040d464dd0cae52c337fafe6
      https://github.com/Kst-plot/kst/commit/e4dbcc472348100e040d464dd0cae52c337fafe6
  Author: Andreas Sturmlechner <asturm at gentoo.org>
  Date:   2026-02-08 (Sun, 08 Feb 2026)

  Changed paths:
    M cmake/modules/FindNetcdf.cmake

  Log Message:
  -----------
  Unconditionally require netcdf-cxx-4

Amends commit 1caf69aa78c2462eea071f5c12d3e8feee96599c

Signed-off-by: Andreas Sturmlechner <asturm at gentoo.org>


  Commit: f966dc5ffbed0f066eaafe1a168c8970d2800070
      https://github.com/Kst-plot/kst/commit/f966dc5ffbed0f066eaafe1a168c8970d2800070
  Author: Barth Netterfield <barth.netterfield at utoronto.ca>
  Date:   2026-02-08 (Sun, 08 Feb 2026)

  Changed paths:
    M devel-docs/launchpad

  Log Message:
  -----------
  update some devel-docs


  Commit: 3dea4573e9315bbfc7c541ba865946b00be6b195
      https://github.com/Kst-plot/kst/commit/3dea4573e9315bbfc7c541ba865946b00be6b195
  Author: Barth Netterfield <barth.netterfield at utoronto.ca>
  Date:   2026-02-08 (Sun, 08 Feb 2026)

  Changed paths:
    A debian/changelog
    A debian/control
    A debian/copyright
    A debian/examples/README
    A debian/examples/example.kst
    A debian/examples/y.dat
    A debian/examples/yn.dat
    A debian/kst-doc.doc-base
    A debian/kst-doc.examples
    A debian/kst-doc.install
    A debian/kst.install
    A debian/not-installed
    A debian/patches/desktop-entry-contains-encoding-key.diff
    A debian/patches/desktop-entry-lacks-main-category.diff
    A debian/patches/fix-qreal-vs-double-for-arm.diff
    A debian/patches/hyphen-used-as-minus-sign.diff
    A debian/patches/series
    A debian/rules
    A debian/source/format
    A debian/watch

  Log Message:
  -----------
  restore debian directory


Compare: https://github.com/Kst-plot/kst/compare/0e605b52c7fc...3dea4573e931

To unsubscribe from these emails, change your notification settings at https://github.com/Kst-plot/kst/settings/notifications


More information about the Kst mailing list