[neon/kde/kompare/Neon/unstable_jammy] debian: kf6ify
Carlos De Maine
null at kde.org
Wed Jul 31 00:19:28 BST 2024
Git commit e50e71025c81c4d04b6962127e6d92ca83610e02 by Carlos De Maine.
Committed on 30/07/2024 at 23:19.
Pushed by carlosdem into branch 'Neon/unstable_jammy'.
kf6ify
(cherry picked from commit ac0a296997b67e8751a6a703477adf1bef8849e5)
Co-authored-by: Carlos De Maine <carlosdemaine at gmail.com>
D +0 -1 debian/compat
M +26 -30 debian/control
M +1 -1 debian/kompare.install
D +0 -5 debian/kpart5-kompare.install
D +0 -4 debian/kpart5-kompare.lintian-overrides
A +5 -0 debian/kpart6-kompare.install
A +4 -0 debian/kpart6-kompare.lintian-overrides
D +0 -1 debian/libkompareinterface5.install
A +1 -0 debian/libkompareinterface6.install
M +4 -6 debian/rules
https://invent.kde.org/neon/kde/kompare/-/commit/e50e71025c81c4d04b6962127e6d92ca83610e02
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 2763040..b1f815f 100644
--- a/debian/control
+++ b/debian/control
@@ -6,23 +6,23 @@ Uploaders: Sune Vuorela <sune at debian.org>,
Modestas Vainius <modax at debian.org>,
George Kiagiadakis <kiagiadakis.george at gmail.com>,
Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 2.8.12~),
- debhelper (>= 11~),
- extra-cmake-modules (>= 5.35.0~),
- libkf5codecs-dev (>= 5.28.0~),
- libkf5config-dev (>= 5.28.0~),
- libkf5coreaddons-dev (>= 5.28.0~),
- libkf5doctools-dev (>= 5.28.0~),
- libkf5iconthemes-dev (>= 5.28.0~),
- libkf5jobwidgets-dev (>= 5.28.0~),
- libkf5parts-dev (>= 5.28.0~),
- libkf5syntaxhighlighting-dev (>= 5.78.0~),
- libkf5texteditor-dev (>= 5.78.0~),
- libkf5widgetsaddons-dev (>= 5.28.0~),
- libkomparediff2-dev (>= 4:18.08~),
- pkg-kde-tools (>= 0.12),
- qtbase5-dev (>= 5.5.0~)
-Standards-Version: 4.2.1
+Build-Depends: cmake,
+ debhelper-compat (>= 13),
+ kf6-extra-cmake-modules,
+ kf6-kcodecs-dev,
+ kf6-kconfig-dev,
+ kf6-kcoreaddons-dev,
+ kf6-kdoctools-dev,
+ kf6-kiconthemes-dev,
+ kf6-kjobwidgets-dev,
+ kf6-kparts-dev,
+ kf6-ktexteditor-dev,
+ kf6-kwidgetsaddons-dev,
+ kf6-syntaxhighlighting-dev,
+ libkomparediff2-dev,
+ pkg-kde-tools-neon,
+ qt6-base-dev,
+Standards-Version: 4.6.2
Homepage: http://www.kde.org/
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kompare
Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kompare.git
@@ -30,12 +30,10 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kompare.git
Package: kompare
Architecture: any
Section: devel
-Depends: kpart5-kompare (= ${binary:Version}),
+Depends: kpart6-kompare (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Suggests: khelpcenter
-Breaks: ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
Description: file difference viewer
Kompare displays the differences between files. It can compare the
contents of files or directories, as well as create, display, and merge patch
@@ -43,12 +41,12 @@ Description: file difference viewer
.
This package is part of the KDE Software Development Kit module.
-Package: kpart5-kompare
+Package: kpart6-kompare
Architecture: any
Section: devel
Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kompare (<< 4:14.12.3+git20150408)
-Replaces: kompare (<< 4:14.12.3+git20150408)
+Breaks: kpart5-kompare,
+Replaces: kpart5-kompare,
Description: file difference viewer - kpart
Kompare displays the differences between files. It can compare the
contents of files or directories, as well as create, display, and merge patch
@@ -59,9 +57,7 @@ Description: file difference viewer - kpart
Package: libkompareinterface-dev
Architecture: any
Section: libdevel
-Depends: libkompareinterface5 (= ${binary:Version}), ${misc:Depends}
-Breaks: kompare (<< 4:14.12.3+git20150408)
-Replaces: kompare (<< 4:14.12.3+git20150408)
+Depends: libkompareinterface6 (= ${binary:Version}), ${misc:Depends}
Description: file difference viewer - kpart interface library development files
Kompare displays the differences between files. It can compare the
contents of files or directories, as well as create, display, and merge patch
@@ -69,14 +65,14 @@ Description: file difference viewer - kpart interface library development files
.
This package is part of the KDE Software Development Kit module.
-Package: libkompareinterface5
+Package: libkompareinterface6
Architecture: any
Multi-Arch: same
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: kpart5-kompare
-Breaks: kompare (<< 4:14.12.3+git20150408)
-Replaces: kompare (<< 4:14.12.3+git20150408)
+Recommends: kpart6-kompare
+Breaks: libkompareinterface5
+Replaces: libkompareinterface5
Description: file difference viewer - kpart interface library
Kompare displays the differences between files. It can compare the
contents of files or directories, as well as create, display, and merge patch
diff --git a/debian/kompare.install b/debian/kompare.install
index d196f66..41286d9 100644
--- a/debian/kompare.install
+++ b/debian/kompare.install
@@ -4,4 +4,4 @@ usr/share/doc/
usr/share/kio/servicemenus/kompare.desktop
usr/share/locale/
usr/share/metainfo/org.kde.kompare.appdata.xml
-usr/share/qlogging-categories5/kompare.categories
+usr/share/qlogging-categories6/kompare.categories
diff --git a/debian/kpart5-kompare.install b/debian/kpart5-kompare.install
deleted file mode 100644
index 29c65f8..0000000
--- a/debian/kpart5-kompare.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/*/libkomparedialogpages.so.5
-usr/lib/*/qt5/plugins/kf5/parts/komparenavtreepart.so
-usr/lib/*/qt5/plugins/kf5/parts/komparepart.so
-usr/share/icons/hicolor/*/apps/kompare.png
-usr/share/icons/hicolor/*/apps/kompare.svgz
diff --git a/debian/kpart5-kompare.lintian-overrides b/debian/kpart5-kompare.lintian-overrides
deleted file mode 100644
index 2c67899..0000000
--- a/debian/kpart5-kompare.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# private library
-kpart5-kompare: package-name-doesnt-match-sonames libkomparedialogpages5
-# private library
-kpart5-kompare: no-symbols-control-file
diff --git a/debian/kpart6-kompare.install b/debian/kpart6-kompare.install
new file mode 100644
index 0000000..903e01a
--- /dev/null
+++ b/debian/kpart6-kompare.install
@@ -0,0 +1,5 @@
+usr/lib/*/libkomparedialogpages.so.6
+usr/lib/*/qt6/plugins/kf6/parts/komparenavtreepart.so
+usr/lib/*/qt6/plugins/kf/parts/komparepart.so
+usr/share/icons/hicolor/*/apps/kompare.png
+usr/share/icons/hicolor/*/apps/kompare.svgz
diff --git a/debian/kpart6-kompare.lintian-overrides b/debian/kpart6-kompare.lintian-overrides
new file mode 100644
index 0000000..147035c
--- /dev/null
+++ b/debian/kpart6-kompare.lintian-overrides
@@ -0,0 +1,4 @@
+# private library
+kpart6-kompare: package-name-doesnt-match-sonames libkomparedialogpages6
+# private library
+kpart6-kompare: no-symbols-control-file
diff --git a/debian/libkompareinterface5.install b/debian/libkompareinterface5.install
deleted file mode 100644
index ca98ec2..0000000
--- a/debian/libkompareinterface5.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libkompareinterface.so.5
diff --git a/debian/libkompareinterface6.install b/debian/libkompareinterface6.install
new file mode 100644
index 0000000..12920fc
--- /dev/null
+++ b/debian/libkompareinterface6.install
@@ -0,0 +1 @@
+usr/lib/*/libkompareinterface.so.6
diff --git a/debian/rules b/debian/rules
index 9b46ac4..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +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-7~
-
-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
-libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
-include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk
+%:
+ dh $@ --with kf6 --buildsystem kf6
More information about the Neon-commits
mailing list