[neon/extras/gcompris-qt/Neon/unstable] debian: kf6ify

Carlos De Maine null at kde.org
Fri Jun 28 01:04:01 BST 2024


Git commit f5e64a669eee5e015ff2667056c4975955c26151 by Carlos De Maine.
Committed on 28/06/2024 at 00:03.
Pushed by carlosdem into branch 'Neon/unstable'.

kf6ify

M  +16   -26   debian/control
M  +6    -13   debian/rules

https://invent.kde.org/neon/extras/gcompris-qt/-/commit/f5e64a669eee5e015ff2667056c4975955c26151

diff --git a/debian/control b/debian/control
index 07148f8c..0503b05d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,25 +4,19 @@ Priority: optional
 Maintainer: Debian Qt Extras Team <debian-qt-kde at lists.debian.org>
 Uploaders: Simon Quigley <tsimonq2 at debian.org>
 Build-Depends: cmake,
-               debhelper-compat (= 12),
-               extra-cmake-modules,
-               libkf5doctools-dev,
-               libkf5i18n-dev,
-               libqt5charts5-dev,
-               libqt5sensors5-dev,
-               libqt5svg5-dev,
-               libqt5xmlpatterns5-dev,
-               pkg-kde-tools,
-               qml-module-box2d,
-               qml-module-qtgraphicaleffects,
-               qml-module-qtmultimedia,
-               qt5-qmake,
-               qtdeclarative5-dev,
-               qtmultimedia5-dev,
-               qtquickcontrols2-5-dev,
-               qttools5-dev,
-               qttools5-dev-tools
-Standards-Version: 4.4.1
+               debhelper-compat (= 13),
+               kf6-extra-cmake-modules,
+               kf6-kdoctools-dev,
+               kf6-ki18n-dev,
+               libkchart6-dev
+               pkg-kde-tools-neon,
+#               qml-module-box2d,
+               qt6-declarative-dev,
+               qt6-multimedia-dev,
+               qt6-sensors-dev,
+               qt6-svg-dev,
+               qt6-tools-dev,
+Standards-Version: 4.6.2
 Homepage: https://gcompris.net/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/gcompris-qt
 Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/gcompris-qt.git
@@ -30,13 +24,9 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/gcompris-qt.git
 Package: gcompris-qt
 Architecture: any
 Depends: gcompris-qt-data (= ${source:Version}),
-         libqt5multimedia5-plugins,
-         qml-module-qt-labs-calendar,
-         qml-module-qtgraphicaleffects,
-         qml-module-qtmultimedia,
-         qml-module-qtquick-controls,
-         qml-module-qtquick-particles2,
-         qt5-image-formats-plugins,
+         qt6-multimedia,
+         qt6-declarative,
+         qt6-imageformats,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: educational games for small children
diff --git a/debian/rules b/debian/rules
index d205f778..8a5e8163 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 #export DH_VERBOSE = 1
-export QT_SELECT := qt5
 DPKG_EXPORT_BUILDFLAGS = 1
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
@@ -10,16 +9,10 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 include /usr/share/dpkg/pkg-info.mk
 
 %:
-	dh $@ --with kf5
+	dh $@ --with kf6 --buildsystem kf6
 
 override_dh_auto_configure:
-	dh_auto_configure -Skf5 -- -DKDE_INSTALL_BINDIR=/usr/games
-
-override_dh_missing:
-	dh_missing --fail-missing
-
-override_dh_strip:
-	dh_strip --dbgsym-migration='gcompris-qt-dbg (<< 0.81-1~)'
+	dh_auto_configure -- -DKDE_INSTALL_BINDIR=/usr/games/
 
 # Use an epoch for the transitional gcompris package, because of the break in
 # numbering scheme introduced by the Qt rewrite
@@ -27,7 +20,7 @@ override_dh_gencontrol:
 	dh_gencontrol -pgcompris -- -v1:$(DEB_VERSION)
 	dh_gencontrol --remaining-packages
 
-override_dh_auto_clean:
-	dh_auto_clean
-	find src -name '*.qrc' -delete
-	rm -f src/activities/activities_out.txt
+#override_dh_auto_clean:
+#	dh_auto_clean
+#	find src -name '*.qrc' -delete
+#	rm -f src/activities/activities_out.txt


More information about the Neon-commits mailing list