[neon/kde/kpimtextedit/Neon/unstable] debian: kf6ify
Scarlett Moore
null at kde.org
Fri Sep 22 16:10:07 BST 2023
Git commit 43c79484b5a62f8b9644a2090af643ac64835d5d by Scarlett Moore.
Committed on 22/09/2023 at 17:09.
Pushed by scarlettmoore into branch 'Neon/unstable'.
kf6ify
D +0 -1 debian/compat
M +62 -87 debian/control
A +4 -0 debian/kpim6-kpimtextedit-dev.install
A +5 -0 debian/kpim6-kpimtextedit.install
R +0 -0 debian/kpim6-kpimtextedit.lintian-overrides [from: debian/libkf5pimtextedit5.lintian-overrides - 100% similarity]
R +0 -0 debian/kpim6-kpimtextedit.maintscript [from: debian/libkf5pimtextedit5.maintscript - 100% similarity]
R +0 -0 debian/kpim6-kpimtextedit.symbols [from: debian/libkf5pimtextedit5.symbols - 100% similarity]
D +0 -2 debian/libkf5pimtextedit-data.install
D +0 -22 debian/libkf5pimtextedit-dev.acc.in
D +0 -5 debian/libkf5pimtextedit-dev.install
D +0 -1 debian/libkf5pimtextedit-plugins.install
D +0 -2 debian/libkf5pimtextedit5.install
D +0 -1 debian/libkf5pimtextedittexttospeech-dev.install
D +0 -0 debian/libkf5pimtextedittexttospeech5.install
D +0 -1 debian/libkf5pimtextedittexttospeech5.symbols
M +1 -11 debian/rules
https://invent.kde.org/neon/kde/kpimtextedit/-/commit/43c79484b5a62f8b9644a2090af643ac64835d5d
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 c0412cb..fe2359c 100644
--- a/debian/control
+++ b/debian/control
@@ -6,67 +6,64 @@ Uploaders: Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake (>= 2.8.12~),
debhelper (>= 9),
doxygen,
- extra-cmake-modules (>= 5.19.0~),
- kdesignerplugin (>= 5.19.0~),
+ kf6-extra-cmake-modules,
+ kdesignerplugin,
libgrantlee5-dev (>= 5.0~),
- libkf5codecs-dev (>= 5.19.0~),
- libkf5configwidgets-dev (>= 5.19.0~),
- libkf5coreaddons-dev (>= 5.19.0~),
- libkf5emoticons-dev (>= 5.19.0~),
- libkf5iconthemes-dev (>= 5.19.0~),
- libkf5kdelibs4support-dev (>= 5.12.0~),
- libkf5kio-dev,
- libkf5ktextaddons-dev,
- libkf5sonnet-dev (>= 5.19.0~),
- libkf5syntaxhighlighting-dev (>= 5.19.0~),
- libkf5textwidgets-dev (>= 5.19.0~),
- libkf5widgetsaddons-dev (>= 5.19.0~),
- libkf5xmlgui-dev (>= 5.19.0~),
- libqt5texttospeech5-dev,
+ kf6-kcodecs-dev,
+ kf6-kconfigwidgets-dev,
+ kf6-kcoreaddons-dev,
+ kf6-kemoticons-dev,
+ kf6-kiconthemes-dev,
+ kf6-kio-dev,
+ kf6-ktextaddons-dev,
+ kf6-sonnet-dev,
+ kf6-syntaxhighlighting-dev,
+ kf6-ktextwidgets-dev,
+ kf6-kwidgetsaddons-dev,
+ kf6-kxmlgui-dev,
ninja-build,
- pkg-kde-tools (>> 0.15.15),
- qtbase5-dev (>= 5.4.0~),
- qttools5-dev,
- qttools5-dev-tools
+ pkg-kde-tools-neon,
+ qt6-base-dev,
+ qt6-tools-dev,
Standards-Version: 3.9.8
Homepage: https://projects.kde.org/projects/kde/pim/kpimtextedit
Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kpimtextedit.git
Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kpimtextedit.git
-Package: libkf5pimtextedit-data
+Package: libkf6pimtextedit-data
Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends}
-Breaks: libkf5pimtextedit5 (<< 22.08.0)
-Conflicts: libkf5pimtextedit5 (<< 22.08.0)
-Description: libkf5pimtextedit - arch independent files
- KPIMTextedit provides a textedit with PIM-specific features. It also provides
- so-called rich text builders which can convert the formatted text in the text
- edit to all kinds of markup, like HTML or BBCODE.
- .
- This package contains the arch independent files.
+Depends: kpim6-kpimtextedit
+Description: Dummy transitional
+ Transitional dummy package.
-Package: libkf5pimtextedit-dev
+Package: kpim6-kpimtextedit-dev
Section: libdevel
Architecture: any
-Depends: libkf5pimtextedit5 (= ${binary:Version}),
- libkf5syntaxhighlighting-dev (>= 5.19.0~),
- libkf5textwidgets-dev (>= 5.19.0~),
+X-Neon-MergedPackage: true
+Depends: kpim6-kpimtextedit (= ${binary:Version}),
+ kf6-syntaxhighlighting-dev,
+ kf6-ktextwidgets-dev,
${misc:Depends}
-Description: libkf5pimtextedit - development files
+Description: kpim6kpimtextedit - development files
KPIMTextedit provides a textedit with PIM-specific features. It also provides
so-called rich text builders which can convert the formatted text in the text
edit to all kinds of markup, like HTML or BBCODE.
.
This package contains the development files.
-Package: libkf5pimtextedit5
+
+Package: libkf6pimtextedit-dev
+Architecture: all
+Depends: kpim6-kpimtextedit-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: kpim6-kpimtextedit
Architecture: any
Multi-Arch: same
-Depends: libkf5pimtextedit-data (= ${source:Version}),
- ${misc:Depends},
+X-Neon-MergedPackage: true
+Depends: ${misc:Depends},
${shlibs:Depends}
-Recommends: libkf5pimtextedit-plugins
Description: library that provides a textedit with PIM-specific features
KPIMTextedit provides a textedit with PIM-specific features. It also provides
so-called rich text builders which can convert the formatted text in the text
@@ -74,56 +71,34 @@ Description: library that provides a textedit with PIM-specific features
.
This package is part of the KDE Development Platform PIM libraries module.
-Package: libkf5pimtextedit-plugins
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: library that provides a textedit with PIM-specific features - plugins
- KPIMTextedit provides a textedit with PIM-specific features. It also provides
- so-called rich text builders which can convert the formatted text in the text
- edit to all kinds of markup, like HTML or BBCODE.
- .
- This package contains the plugin for Qt Designer.
+Package: libkf6pimtextedit6
+Architecture: all
+Depends: kpim6-kpimtextedit
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf6pimtextedit-plugins
+Architecture: all
+Depends: kpim6-kpimtextedit
+Description: Dummy transitional
+ Transitional dummy package.
-Package: libkf5pimtextedittexttospeech-data
+Package: libkf6pimtextedittexttospeech-data
Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends}
-Breaks: libkf5pimtextedittospeech5 (<< 22.08.0)
-Conflicts: libkf5pimtextedittexttospeech5 (<< 22.08.0)
-Description: libkf5pimtextedit - arch independent files
- KPIMTextedit provides a textedit with PIM-specific features. It also provides
- so-called rich text builders which can convert the formatted text in the text
- edit to all kinds of markup, like HTML or BBCODE.
- .
- This package contains the arch independent files.
+Depends: kpim6-kpimtextedit
+Description: Dummy transitional
+ Transitional dummy package.
-Package: libkf5pimtextedittexttospeech-dev
-Section: libdevel
-Architecture: any
-Depends: libkf5pimtextedittexttospeech5 (= ${binary:Version}),
- libkf5syntaxhighlighting-dev (>= 5.19.0~),
- libkf5textwidgets-dev (>= 5.19.0~),
- ${misc:Depends}
-Description: libkf5pimtextedittexttospeech - development files
- KPIMTextedit provides a textedit with PIM-specific features. It also provides
- so-called rich text builders which can convert the formatted text in the text
- edit to all kinds of markup, like HTML or BBCODE.
- .
- This package contains the development files.
+Package: libkf6pimtextedittexttospeech-dev
+Architecture: all
+Depends: kpim6-kpimtextedit-dev
+Description: Dummy transitional
+ Transitional dummy package.
-Package: libkf5pimtextedittexttospeech5
-Architecture: any
-Multi-Arch: same
-Depends: libkf5pimtextedittexttospeech-data (= ${source:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Recommends:
-Description: library that provides a textedit with PIM-specific features
- KPIMTextedit provides a textedit with PIM-specific features. It also provides
- so-called rich text builders which can convert the formatted text in the text
- edit to all kinds of markup, like HTML or BBCODE.
- .
- This package is part of the KDE Development Platform PIM libraries module.
+Package: libkf6pimtextedittexttospeech6
+Architecture: all
+Depends: kpim6-kpimtextedit
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/kpim6-kpimtextedit-dev.install b/debian/kpim6-kpimtextedit-dev.install
new file mode 100644
index 0000000..66f30cb
--- /dev/null
+++ b/debian/kpim6-kpimtextedit-dev.install
@@ -0,0 +1,4 @@
+usr/include/KPim6/KPIMTextEdit/
+usr/lib/*/cmake/KPim6TextEdit/
+usr/lib/*/libKPim6TextEdit.so
+usr/lib/*/qt6/mkspecs/modules/qt_KPIMTextEdit.pri
diff --git a/debian/kpim6-kpimtextedit.install b/debian/kpim6-kpimtextedit.install
new file mode 100644
index 0000000..932259b
--- /dev/null
+++ b/debian/kpim6-kpimtextedit.install
@@ -0,0 +1,5 @@
+usr/lib/*/libKPim6TextEdit.so.6
+usr/lib/*/libKPim6TextEdit.so.*.*
+usr/share/locale/
+usr/share/qlogging-categories5/kpimtextedit.categories
+usr/lib/*/qt6/plugins/designer/kpimtextedit6widgets.so
diff --git a/debian/libkf5pimtextedit5.lintian-overrides b/debian/kpim6-kpimtextedit.lintian-overrides
similarity index 100%
rename from debian/libkf5pimtextedit5.lintian-overrides
rename to debian/kpim6-kpimtextedit.lintian-overrides
diff --git a/debian/libkf5pimtextedit5.maintscript b/debian/kpim6-kpimtextedit.maintscript
similarity index 100%
rename from debian/libkf5pimtextedit5.maintscript
rename to debian/kpim6-kpimtextedit.maintscript
diff --git a/debian/libkf5pimtextedit5.symbols b/debian/kpim6-kpimtextedit.symbols
similarity index 100%
rename from debian/libkf5pimtextedit5.symbols
rename to debian/kpim6-kpimtextedit.symbols
diff --git a/debian/libkf5pimtextedit-data.install b/debian/libkf5pimtextedit-data.install
deleted file mode 100644
index f53dbe7..0000000
--- a/debian/libkf5pimtextedit-data.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/locale/
-usr/share/qlogging-categories5/kpimtextedit.categories
diff --git a/debian/libkf5pimtextedit-dev.acc.in b/debian/libkf5pimtextedit-dev.acc.in
deleted file mode 100644
index 026a9f1..0000000
--- a/debian/libkf5pimtextedit-dev.acc.in
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<descriptor>
-
-<version>
- 15.07.90
-</version>
-
-<headers>
- /usr/include/KF5/KPIMTextEdit/
- /usr/include/KF5/kpimtextedit_version.h
-</headers>
-
-<libs>
- /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5PimTextEdit.so
-</libs>
-
-<gcc_options>
- -fPIC
- -std=c++11
-</gcc_options>
-
-</descriptor>
diff --git a/debian/libkf5pimtextedit-dev.install b/debian/libkf5pimtextedit-dev.install
deleted file mode 100644
index 9337654..0000000
--- a/debian/libkf5pimtextedit-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/include/KPim5/KPIMTextEdit/
-usr/lib/*/cmake/KF5PimTextEdit/
-usr/lib/*/cmake/KPim5TextEdit/
-usr/lib/*/libKPim5TextEdit.so
-usr/lib/*/qt5/mkspecs/modules/qt_KPIMTextEdit.pri
diff --git a/debian/libkf5pimtextedit-plugins.install b/debian/libkf5pimtextedit-plugins.install
deleted file mode 100644
index 5718fb8..0000000
--- a/debian/libkf5pimtextedit-plugins.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/qt5/plugins/designer/kpimtextedit5widgets.so
diff --git a/debian/libkf5pimtextedit5.install b/debian/libkf5pimtextedit5.install
deleted file mode 100644
index b39aba6..0000000
--- a/debian/libkf5pimtextedit5.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libKPim5TextEdit.so.5
-usr/lib/*/libKPim5TextEdit.so.5.*
diff --git a/debian/libkf5pimtextedittexttospeech-dev.install b/debian/libkf5pimtextedittexttospeech-dev.install
deleted file mode 100644
index 8b13789..0000000
--- a/debian/libkf5pimtextedittexttospeech-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/libkf5pimtextedittexttospeech5.install b/debian/libkf5pimtextedittexttospeech5.install
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/libkf5pimtextedittexttospeech5.symbols b/debian/libkf5pimtextedittexttospeech5.symbols
deleted file mode 100644
index 8b13789..0000000
--- a/debian/libkf5pimtextedittexttospeech5.symbols
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/rules b/debian/rules
index 953b508..bb99127 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,7 @@
#!/usr/bin/make -f
-l10npkgs_firstversion_ok := 4:17.03.90-0~
-
-CMAKE_ARGS = -G Ninja
-
%:
- dh $@ --with pkgkde_symbolshelper
-
-override_dh_auto_configure:
- dh_auto_configure -- $(CMAKE_ARGS)
-
-override_dh_strip:
- $(overridden_command) --dbgsym-migration='libkf5pimtextedit-dbg (<= 15.12.0-1~~)'
+ dh $@ --with kf6 --buildsystem kf6
override_dh_auto_test:
# Disable auto test at build time, fakeroot breaks them
More information about the Neon-commits
mailing list