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

Carlos De Maine null at kde.org
Mon Oct 2 02:31:28 BST 2023


Git commit ad151a5d0b12dd6a8a30d37c2e319298c41e642b by Carlos De Maine.
Committed on 02/10/2023 at 03:31.
Pushed by carlosdem into branch 'Neon/unstable'.

Revert "kf6ify"

This reverts commit d80b3c86d0bca17070213768acae8b8caecb7ae8.

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

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

diff --git a/debian/control b/debian/control
index 433aec2..849e87f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,15 @@
-Source: grantlee
+Source: grantlee5
 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-neon,
-               qt6-base-dev,
-               qt6-declarative-dev,
-               qt6-tools-dev,
+               pkg-kde-tools,
+               qtbase5-dev (>= 5.4),
+               qtdeclarative5-dev (>= 5.4),
+               qttools5-dev (>= 5.4),
+               qttools5-dev-tools (>= 5.4),
                xauth <!nocheck>,
                xvfb <!nocheck>,
 Standards-Version: 4.6.1
@@ -17,7 +18,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-textdocument6
+Package: libgrantlee-textdocument5
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -27,7 +28,7 @@ Description: Grantlee templating library for Qt - TextDocument
  .
  This package contains the TextDocument Grantlee library.
 
-Package: libgrantlee-templates6
+Package: libgrantlee-templates5
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -38,13 +39,15 @@ Description: Grantlee templating library for Qt - Templates
  This package contains the Templates Grantlee library. It also contains the
  standard plugins.
 
-Package: libgrantlee6-dev
+Package: libgrantlee5-dev
 Section: libdevel
 Architecture: any
-Depends: libgrantlee-templates6 (= ${binary:Version}),
-         libgrantlee-textdocument6 (= ${binary:Version}),
-         qt6-base-dev,
+Depends: libgrantlee-templates5 (= ${binary:Version}),
+         libgrantlee-textdocument5 (= ${binary:Version}),
+         qtbase5-dev (>= 5.4),
          ${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-templates6.install b/debian/libgrantlee-templates5.install
similarity index 100%
rename from debian/libgrantlee-templates6.install
rename to debian/libgrantlee-templates5.install
diff --git a/debian/libgrantlee-templates6.symbols b/debian/libgrantlee-templates5.symbols
similarity index 100%
rename from debian/libgrantlee-templates6.symbols
rename to debian/libgrantlee-templates5.symbols
diff --git a/debian/libgrantlee-textdocument6.install b/debian/libgrantlee-textdocument5.install
similarity index 100%
rename from debian/libgrantlee-textdocument6.install
rename to debian/libgrantlee-textdocument5.install
diff --git a/debian/libgrantlee-textdocument6.symbols b/debian/libgrantlee-textdocument5.symbols
similarity index 100%
rename from debian/libgrantlee-textdocument6.symbols
rename to debian/libgrantlee-textdocument5.symbols
diff --git a/debian/libgrantlee6-dev.examples b/debian/libgrantlee5-dev.examples
similarity index 100%
rename from debian/libgrantlee6-dev.examples
rename to debian/libgrantlee5-dev.examples
diff --git a/debian/libgrantlee6-dev.install b/debian/libgrantlee5-dev.install
similarity index 100%
rename from debian/libgrantlee6-dev.install
rename to debian/libgrantlee5-dev.install
diff --git a/debian/libgrantlee6-dev.lintian-overrides b/debian/libgrantlee5-dev.lintian-overrides
similarity index 100%
rename from debian/libgrantlee6-dev.lintian-overrides
rename to debian/libgrantlee5-dev.lintian-overrides
diff --git a/debian/rules b/debian/rules
index 2a8b3f1..6823457 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,10 +13,10 @@ export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath
 #endif
 
 %:
-	dh $@ --with pkgkde_symbolshelper --with kf6 --buildsystem kf6
+	dh $@ --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DGRANTLEE_BUILD_WITH_QT6=ON -DBUILD_TESTS=OFF -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
+	dh_auto_configure -- -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