[neon/extras/grantlee/Neon/unstable] debian: kf6ify

Scarlett Moore null at kde.org
Fri Sep 22 14:27:48 BST 2023


Git commit d80b3c86d0bca17070213768acae8b8caecb7ae8 by Scarlett Moore.
Committed on 22/09/2023 at 15:27.
Pushed by scarlettmoore into branch 'Neon/unstable'.

kf6ify

M  +11   -14   debian/control
R  +0    -0    debian/libgrantlee-templates6.install [from: debian/libgrantlee-templates5.install - 100% similarity]
R  +0    -0    debian/libgrantlee-templates6.symbols [from: debian/libgrantlee-templates5.symbols - 100% similarity]
R  +0    -0    debian/libgrantlee-textdocument6.install [from: debian/libgrantlee-textdocument5.install - 100% similarity]
R  +0    -0    debian/libgrantlee-textdocument6.symbols [from: debian/libgrantlee-textdocument5.symbols - 100% similarity]
R  +0    -0    debian/libgrantlee6-dev.examples [from: debian/libgrantlee5-dev.examples - 100% similarity]
R  +0    -0    debian/libgrantlee6-dev.install [from: debian/libgrantlee5-dev.install - 100% similarity]
R  +0    -0    debian/libgrantlee6-dev.lintian-overrides [from: debian/libgrantlee5-dev.lintian-overrides - 100% similarity]
M  +2    -2    debian/rules

https://invent.kde.org/neon/extras/grantlee/-/commit/d80b3c86d0bca17070213768acae8b8caecb7ae8

diff --git a/debian/control b/debian/control
index 849e87f..433aec2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,14 @@
-Source: grantlee5
+Source: grantlee
 Section: libs
 Priority: optional
 Maintainer: Debian Krap Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Pino Toscano <pino at debian.org>
 Build-Depends: cmake (>= 3.5~),
                debhelper-compat (= 13),
-               pkg-kde-tools,
-               qtbase5-dev (>= 5.4),
-               qtdeclarative5-dev (>= 5.4),
-               qttools5-dev (>= 5.4),
-               qttools5-dev-tools (>= 5.4),
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-declarative-dev,
+               qt6-tools-dev,
                xauth <!nocheck>,
                xvfb <!nocheck>,
 Standards-Version: 4.6.1
@@ -18,7 +17,7 @@ Homepage: http://www.grantlee.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/grantlee
 Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/grantlee.git
 
-Package: libgrantlee-textdocument5
+Package: libgrantlee-textdocument6
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -28,7 +27,7 @@ Description: Grantlee templating library for Qt - TextDocument
  .
  This package contains the TextDocument Grantlee library.
 
-Package: libgrantlee-templates5
+Package: libgrantlee-templates6
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -39,15 +38,13 @@ Description: Grantlee templating library for Qt - Templates
  This package contains the Templates Grantlee library. It also contains the
  standard plugins.
 
-Package: libgrantlee5-dev
+Package: libgrantlee6-dev
 Section: libdevel
 Architecture: any
-Depends: libgrantlee-templates5 (= ${binary:Version}),
-         libgrantlee-textdocument5 (= ${binary:Version}),
-         qtbase5-dev (>= 5.4),
+Depends: libgrantlee-templates6 (= ${binary:Version}),
+         libgrantlee-textdocument6 (= ${binary:Version}),
+         qt6-base-dev,
          ${misc:Depends}
-Breaks: libgrantlee-dev (<= 5~)
-Replaces: libgrantlee-dev (<= 5~)
 Description: Grantlee templating library development files
  Grantlee is a string template engine based on the Django template system
  and written in Qt.
diff --git a/debian/libgrantlee-templates5.install b/debian/libgrantlee-templates6.install
similarity index 100%
rename from debian/libgrantlee-templates5.install
rename to debian/libgrantlee-templates6.install
diff --git a/debian/libgrantlee-templates5.symbols b/debian/libgrantlee-templates6.symbols
similarity index 100%
rename from debian/libgrantlee-templates5.symbols
rename to debian/libgrantlee-templates6.symbols
diff --git a/debian/libgrantlee-textdocument5.install b/debian/libgrantlee-textdocument6.install
similarity index 100%
rename from debian/libgrantlee-textdocument5.install
rename to debian/libgrantlee-textdocument6.install
diff --git a/debian/libgrantlee-textdocument5.symbols b/debian/libgrantlee-textdocument6.symbols
similarity index 100%
rename from debian/libgrantlee-textdocument5.symbols
rename to debian/libgrantlee-textdocument6.symbols
diff --git a/debian/libgrantlee5-dev.examples b/debian/libgrantlee6-dev.examples
similarity index 100%
rename from debian/libgrantlee5-dev.examples
rename to debian/libgrantlee6-dev.examples
diff --git a/debian/libgrantlee5-dev.install b/debian/libgrantlee6-dev.install
similarity index 100%
rename from debian/libgrantlee5-dev.install
rename to debian/libgrantlee6-dev.install
diff --git a/debian/libgrantlee5-dev.lintian-overrides b/debian/libgrantlee6-dev.lintian-overrides
similarity index 100%
rename from debian/libgrantlee5-dev.lintian-overrides
rename to debian/libgrantlee6-dev.lintian-overrides
diff --git a/debian/rules b/debian/rules
index 6823457..2a8b3f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,10 +13,10 @@ export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath
 #endif
 
 %:
-	dh $@ --with pkgkde_symbolshelper
+	dh $@ --with pkgkde_symbolshelper --with kf6 --buildsystem kf6
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DBUILD_TESTS=OFF -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
+	dh_auto_configure -- -DGRANTLEE_BUILD_WITH_QT6=ON -DBUILD_TESTS=OFF -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
 
 #override_dh_auto_test:
 #	xvfb-run -a dh_auto_test $(fail_param)


More information about the Neon-commits mailing list