[neon/kde/libkmahjongg/Neon/unstable] debian: kf6ify
Scarlett Moore
null at kde.org
Thu Sep 28 17:41:55 BST 2023
Git commit f8c784d08f97b714eb26733a57cf9611d56e916d by Scarlett Moore.
Committed on 28/09/2023 at 18:41.
Pushed by scarlettmoore into branch 'Neon/unstable'.
kf6ify
D +0 -1 debian/compat
M +17 -17 debian/control
D +0 -2 debian/kdegames-mahjongg-data-kf5.install
A +2 -0 debian/kdegames-mahjongg-data-kf6.install
R +0 -0 debian/kdegames-mahjongg-data-kf6.maintscript [from: debian/kdegames-mahjongg-data-kf5.maintscript - 100% similarity]
D +0 -3 debian/libkf5kmahjongglib-dev.install
D +0 -3 debian/libkf5kmahjongglib5.install
R +2 -2 debian/libkf6kmahjongglib-dev.acc.in [from: debian/libkf5kmahjongglib-dev.acc.in - 067% similarity]
A +3 -0 debian/libkf6kmahjongglib-dev.install
A +3 -0 debian/libkf6kmahjongglib6.install
R +1 -1 debian/libkf6kmahjongglib6.symbols [from: debian/libkf5kmahjongglib5.symbols - 098% similarity]
M +4 -7 debian/rules
https://invent.kde.org/neon/kde/libkmahjongg/-/commit/f8c784d08f97b714eb26733a57cf9611d56e916d
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 5da9681..9f7e136 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: libkf5kmahjongg
+Source: kf6-kkmahjongg
Section: libs
Priority: optional
Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
@@ -10,23 +10,23 @@ Uploaders: Daniel Schepler <schepler at debian.org>,
Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake (>= 2.8.12~),
- debhelper (>= 9),
- extra-cmake-modules (>= 1.3.0~),
- libkf5completion-dev,
- libkf5config-dev,
- libkf5configwidgets-dev,
- libkf5coreaddons-dev,
- libkf5i18n-dev,
- libkf5widgetsaddons-dev,
- libqt5svg5-dev (>= 5.4),
- pkg-kde-tools (>= 0.14),
- qtbase5-dev (>= 5.4)
+ debhelper-compat (= 12),
+ kf6-extra-cmake-modules,
+ kf6-kcompletion-dev,
+ kf6-kconfig-dev,
+ kf6-kconfigwidgets-dev,
+ kf6-kcoreaddons-dev,
+ kf6-ki18n-dev,
+ kf6-kwidgetsaddons-dev,
+ qt6-svg-dev,
+ pkg-kde-tools-neon),
+ qt6-base-dev
Standards-Version: 4.1.1
Homepage: http://games.kde.org/
Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/libkmahjongg.git
Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/libkmahjongg.git
-Package: kdegames-mahjongg-data-kf5
+Package: kdegames-mahjongg-data-kf6
Section: games
Architecture: all
Depends: ${misc:Depends}
@@ -36,11 +36,11 @@ Description: tilesets and backgrounds for Mahjongg games
.
This package is part of the KDE games module.
-Package: libkf5kmahjongglib-dev
+Package: libkf6kmahjongglib-dev
Section: libdevel
Architecture: any
-Depends: libkf5configwidgets-dev,
- libkf5kmahjongglib5 (= ${binary:Version}),
+Depends: kf6-kconfigwidgets-dev,
+ libkf6kmahjongglib6 (= ${binary:Version}),
${misc:Depends}
Description: development files for the KDE kmahjongg library
This package contains development files for building software that uses
@@ -48,7 +48,7 @@ Description: development files for the KDE kmahjongg library
.
This package is part of the KDE games module.
-Package: libkf5kmahjongglib5
+Package: libkf6kmahjongglib6
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: ${kde-l10n:all}
diff --git a/debian/kdegames-mahjongg-data-kf5.install b/debian/kdegames-mahjongg-data-kf5.install
deleted file mode 100644
index 315d4fe..0000000
--- a/debian/kdegames-mahjongg-data-kf5.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/kmahjongglib/*
-usr/share/qlogging-categories5/libkmahjongg.categories
diff --git a/debian/kdegames-mahjongg-data-kf6.install b/debian/kdegames-mahjongg-data-kf6.install
new file mode 100644
index 0000000..0aeaee1
--- /dev/null
+++ b/debian/kdegames-mahjongg-data-kf6.install
@@ -0,0 +1,2 @@
+usr/share/kmahjongglib/*
+usr/share/qlogging-categories6/libkmahjongg.categories
diff --git a/debian/kdegames-mahjongg-data-kf5.maintscript b/debian/kdegames-mahjongg-data-kf6.maintscript
similarity index 100%
rename from debian/kdegames-mahjongg-data-kf5.maintscript
rename to debian/kdegames-mahjongg-data-kf6.maintscript
diff --git a/debian/libkf5kmahjongglib-dev.install b/debian/libkf5kmahjongglib-dev.install
deleted file mode 100644
index 43a55cf..0000000
--- a/debian/libkf5kmahjongglib-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/KF5/KMahjongg
-usr/lib/*/cmake/KF5KMahjongglib/
-usr/lib/*/libKF5KMahjongglib.so
diff --git a/debian/libkf5kmahjongglib5.install b/debian/libkf5kmahjongglib5.install
deleted file mode 100644
index 075ebdc..0000000
--- a/debian/libkf5kmahjongglib5.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libKF5KMahjongglib.so.5
-usr/lib/*/libKF5KMahjongglib.so.5.*
-usr/share/locale/
diff --git a/debian/libkf5kmahjongglib-dev.acc.in b/debian/libkf6kmahjongglib-dev.acc.in
similarity index 67%
rename from debian/libkf5kmahjongglib-dev.acc.in
rename to debian/libkf6kmahjongglib-dev.acc.in
index 6c91242..960b283 100644
--- a/debian/libkf5kmahjongglib-dev.acc.in
+++ b/debian/libkf6kmahjongglib-dev.acc.in
@@ -6,11 +6,11 @@
</version>
<headers>
- /usr/include/KF5/KF5KMahjongg/
+ /usr/include/KF6/KF6KMahjongg/
</headers>
<libs>
- /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5KMahjongglib.so
+ /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF6KMahjongglib.so
</libs>
<gcc_options>
diff --git a/debian/libkf6kmahjongglib-dev.install b/debian/libkf6kmahjongglib-dev.install
new file mode 100644
index 0000000..66af48d
--- /dev/null
+++ b/debian/libkf6kmahjongglib-dev.install
@@ -0,0 +1,3 @@
+usr/include/KF6/KMahjongg
+usr/lib/*/cmake/KF6KMahjongglib/
+usr/lib/*/libKF6KMahjongglib.so
diff --git a/debian/libkf6kmahjongglib6.install b/debian/libkf6kmahjongglib6.install
new file mode 100644
index 0000000..cb011f1
--- /dev/null
+++ b/debian/libkf6kmahjongglib6.install
@@ -0,0 +1,3 @@
+usr/lib/*/libKF6KMahjongglib.so.6
+usr/lib/*/libKF6KMahjongglib.so.6.*
+usr/share/locale/
diff --git a/debian/libkf5kmahjongglib5.symbols b/debian/libkf6kmahjongglib6.symbols
similarity index 98%
rename from debian/libkf5kmahjongglib5.symbols
rename to debian/libkf6kmahjongglib6.symbols
index f9d4197..7a266ce 100644
--- a/debian/libkf5kmahjongglib5.symbols
+++ b/debian/libkf6kmahjongglib6.symbols
@@ -1,5 +1,5 @@
# SymbolsHelper-Confirmed: 14.12.50 amd64
-libKF5KMahjongglib.so.5 libkf5kmahjongglib5 #MINVER#
+libKF6KMahjongglib.so.6 libkf5kmahjongglib5 #MINVER#
_ZN16KMahjonggTileset11loadDefaultEv at Base 14.12.50
_ZN16KMahjonggTileset11loadTilesetERK7QString at Base 14.12.50
_ZN16KMahjonggTileset12loadGraphicsEv at Base 14.12.50
diff --git a/debian/rules b/debian/rules
index 075633f..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,6 @@
#!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
-l10npkgs_firstversion_ok := 4:16.04.3-2~
-
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
-
-override_dh_strip:
- $(overridden_command) --dbgsym-migration='libkf5kmahjongglib-dbg (<= 15.12.1-1~~)'
+%:
+ dh $@ --with kf6 --buildsystem kf6
More information about the Neon-commits
mailing list