[neon/qt/qtcreator/Neon/release] debian: note different patch status

Pino Toscano null at kde.org
Mon Jan 16 22:09:47 GMT 2023


Git commit 0e701a3223021018e017fcd895b9a38cd3a3d33f by Pino Toscano.
Committed on 17/06/2022 at 16:44.
Pushed by carlosdem into branch 'Neon/release'.

note different patch status

when comparing with the new version, it was going to be dropped anyway

M  +3    -4    debian/changelog

https://invent.kde.org/neon/qt/qtcreator/commit/0e701a3223021018e017fcd895b9a38cd3a3d33f

diff --git a/debian/changelog b/debian/changelog
index 3642570..9f25e81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ qtcreator (8.0.0~beta1-0r1) UNRELEASED; urgency=medium
   * Switch watch file to the unstable releases, mangling -beta/-rc in the
     version.
   * Switch Vcs-* fields to the 'experimental' packaging branch.
+  * Update the patches:
+    - upstream_Correctly-include-KSyntaxHighlighting-headers.patch: drop,
+      backported from upstream
   * Switch qtcreator to build with Qt6 instead of Qt5:
     - remove libkf5syntaxhighlighting-dev, libqt5opengl5-dev,
       libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev,
@@ -32,10 +35,6 @@ qtcreator (8.0.0~beta1-0r1) UNRELEASED; urgency=medium
       - switch qtdeclarative5-dev-tools to qt6-declarative-dev-tools
       - switch qttools5-dev-tools to qt6-tools-dev-tools
       - switch qttranslations5-l10n to qt6-translations-l10n
-    - drop patch upstream_Correctly-include-KSyntaxHighlighting-headers.patch,
-      which does not change the embedded copy of KSyntaxHighlighting, breaking
-      its usage (used because there is no Qt6 version of KSyntaxHighlighting
-      yet)
     - remove the license files installed from the embedded copy of
       KSyntaxHighlighting
     - the switch enables the build of the QML Designer plugin, which is built



More information about the Neon-commits mailing list