[neon/kf6/kf6-ktextaddons/Neon/unstable] debian: port to kf6

Carlos De Maine null at kde.org
Sat May 6 10:20:40 BST 2023


Git commit 4443cac837a3ea4974a552c663ebc2e91139a20a by Carlos De Maine.
Committed on 06/05/2023 at 09:20.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6

M  +56   -71   debian/control
A  +11   -0    debian/kf6-ktextaddons-dev.install
A  +10   -0    debian/kf6-ktextaddons.install
D  +0    -1    debian/ktextaddons.install
D  +0    -11   debian/libkf5ktextaddons-dev.install
D  +0    -1    debian/libkf5textaddonswidgets1.install
D  +0    -2    debian/libkf5textautocorrection1.install
D  +0    -1    debian/libkf5textautocorrection1.lintian-overrides
D  +0    -1    debian/libkf5textedittexttospeech1.install
D  +0    -2    debian/libkf5textemoticons1.install
D  +0    -1    debian/libkf5textemoticons1.lintian-overrides
D  +0    -1    debian/libkf5textgrammarcheck1.install
D  +0    -2    debian/libkf5texttranslator1.install
M  +2    -5    debian/rules
M  +3    -1    debian/watch [INFRASTRUCTURE]

https://invent.kde.org/neon/kf6/kf6-ktextaddons/commit/4443cac837a3ea4974a552c663ebc2e91139a20a

diff --git a/debian/control b/debian/control
index 66f188d..326fb5a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,105 +1,90 @@
-Source: ktextaddons
+Source: kf6-ktextaddons
 Section: kde
 Priority: optional
 Maintainer: Jonathan Esk-Riddell <jr at jriddell.org>
 Build-Depends: cmake,
                debhelper-compat (= 13),
-               extra-cmake-modules,
                gettext,
-               libkf5archive-dev,
-               libkf5configwidgets-dev,
-               libkf5coreaddons-dev,
-               libkf5i18n-dev,
-               libkf5xmlgui-dev,
-               libqt5texttospeech5-dev,
-               pkg-kde-tools,
-               qt5keychain-dev,
-               qtbase5-dev,
-               qttools5-dev
+               kf6-extra-cmake-modules,
+               kf6-karchive-dev,
+               kf6-kconfigwidgets-dev,
+               kf6-kcoreaddons-dev,
+               kf6-ki18n-dev,
+               kf6-kxmlgui-dev,
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-keychain-dev,
+               qt6-texttospeech-dev,
+               qt6-tools-dev
 Standards-Version: 4.5.0
 Homepage: https://invent.kde.org/libraries/ktextaddons
 
-Package: ktextaddons
+Package: kf6-ktextaddons
+Architecture: any
+Section: kde
+X-Neon-MergedPackage: true
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Architecture: all
-Depends: libkf5textgrammarcheck1 (= ${binary:Version}),
-                  libkf5texttranslator1 (= ${binary:Version}),
-                  libkf5textedittexttospeech1 (= ${binary:Version}),
-                  libkf5textautocorrection1 (= ${binary:Version}),
-                  libkf5textaddonswidgets1 (= ${binary:Version}),
-                  libkf5textemoticons1 (= ${binary:Version}),
-                  ${misc:Depends}, ${shlibs:Depends}
 Description: Text processing library from KDE
  Various text handling addons
 
-Package: libkf5ktextaddons-dev
+Package: libkf6ktextaddons-dev
 Architecture: any
 Multi-Arch: same
-Depends: ktextaddons (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Breaks: ktextaddons-dev (<< 1.1.1)
-Replaces: ktextaddons-dev (<< 1.1.1)
-Description: Text processing library from KDE - development files
- Various text handling addons - dev bits
- .
- This package contains the arch independent files.
+Depends: kf6-ktextaddons-dev  (= ${binary:Version}),
+         kf6-karchive-dev,
+         kf6-kconfigwidgets-dev,
+         kf6-kcoreaddons-dev,
+         kf6-ki18n-dev,
+         kf6-kxmlgui-dev,
+         qt6-base-dev,
+         qt6-keychain-dev,
+         qt6-texttospeech-dev,
+         qt6-tools-dev,
+         ${misc:Depends}
+Description: Text processing library from KDE
+ Various text handling addons.
+  .
+ Contains development files for ktextaddons
 
-Package: libkf5textgrammarcheck1
+Package: libkf6textgrammarcheck1
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: ktextaddons (<< 1.1.1)
-Replaces: ktextaddons (<< 1.1.1)
-Description: Text processing library from KDE - grammarcheck features
- .
- This package is part of the KDE libraries module.
+Depends: kf6-ktextaddons
+Description: Dummy transitional
+ Transitional dummy package.
 
-Package: libkf5texttranslator1
+Package: libkf6texttranslator1
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: ktextaddons (<< 1.1.1), libkf5ktextaddons-dev (<< 1.1.1)
-Replaces: ktextaddons (<< 1.1.1), libkf5ktextaddons-dev (<< 1.1.1)
-Description: Text processing library from KDE - text translator features
- .
- This package is part of the KDE libraries module.
+Depends: kf6-ktextaddons
+Description: Dummy transitional
+ Transitional dummy package.
 
-Package: libkf5textedittexttospeech1
+Package: libkf6textedittexttospeech1
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: ktextaddons (<< 1.1.1)
-Replaces: ktextaddons (<< 1.1.1)
-Description: Text processing library from KDE - text to speech features
- .
- This package is part of the KDE libraries module.
+Depends: kf6-ktextaddons
+Description: Dummy transitional
+ Transitional dummy package.
 
-Package: libkf5textautocorrection1
+Package: libkf6textautocorrection1
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: ktextaddons (<< 1.1.1)
-Replaces: ktextaddons (<< 1.1.1)
-Description: Text processing library from KDE - auto correction features
- .
- This package is part of the KDE libraries module.
+Depends: kf6-ktextaddons
+Description: Dummy transitional
+ Transitional dummy package.
 
-Package: libkf5textaddonswidgets1
+Package: libkf6textaddonswidgets1
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: ktextaddons (<< ${source:Version}~ciBuild)
-Replaces: ktextaddons (<< ${source:Version}~ciBuild)
-Description: Text processing library from KDE - addon text widgets
- .
- This package is part of the KDE libraries module.
+Depends: kf6-ktextaddons
+Description: Dummy transitional
+ Transitional dummy package.
 
 Package: libkf5textemoticons1
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: ktextaddons (<< ${source:Version}~ciBuild)
-Replaces: ktextaddons (<< ${source:Version}~ciBuild)
-Description: Text processing library from KDE - addon emoticon widgets
- .
- This package is part of the KDE libraries module.
\ No newline at end of file
+Depends: kf6-ktextaddons
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/kf6-ktextaddons-dev.install b/debian/kf6-ktextaddons-dev.install
new file mode 100644
index 0000000..379d554
--- /dev/null
+++ b/debian/kf6-ktextaddons-dev.install
@@ -0,0 +1,11 @@
+usr/kf6/include/
+usr/kf6/lib/*/cmake/KF6TextAutoCorrectionCore/
+usr/kf6/lib/*/cmake/KF6TextAutoCorrectionWidgets/
+usr/kf6/lib/*/cmake/KF6TextEmoticonsCore/
+usr/kf6/lib/*/cmake/KF6TextEmoticonsWidgets/
+usr/kf6/lib/*/cmake/KF6TextGrammarCheck/
+usr/kf6/lib/*/cmake/KF6TextTranslator/
+usr/kf6/lib/*/cmake/KF6TextEditTextToSpeech/
+usr/kf6/lib/*/cmake/KF6TextAddonsWidgets/
+usr/kf6/lib/*/libKF6*.so
+usr/kf6/lib/*/qt6/mkspecs/
\ No newline at end of file
diff --git a/debian/kf6-ktextaddons.install b/debian/kf6-ktextaddons.install
new file mode 100644
index 0000000..2268c9f
--- /dev/null
+++ b/debian/kf6-ktextaddons.install
@@ -0,0 +1,10 @@
+usr/kf6/share/locale/*/LC_MESSAGES/
+usr/kf6/lib/*/libKF6TextAddonsWidgets.so.*
+usr/kf6/lib/*/libKF6TextAutoCorrectionCore.so.*
+usr/kf6/lib/*/libKF6TextAutoCorrectionWidgets.so.*
+usr/kf6/lib/*/libKF6TextEditTextToSpeech.so.*
+usr/kf6lib/*/libKF6TextEmoticonsCore.so.*
+usr/kf6/lib/*/libKF6TextEmoticonsWidgets.so.*
+usr/kf6/lib/*/libKF6TextGrammarCheck.so.*
+usr/kf6/lib/*/libKF6TextTranslator.so.*
+usr/kf6/lib/*/qt5/plugins/
\ No newline at end of file
diff --git a/debian/ktextaddons.install b/debian/ktextaddons.install
deleted file mode 100644
index f281f64..0000000
--- a/debian/ktextaddons.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/*/LC_MESSAGES/
diff --git a/debian/libkf5ktextaddons-dev.install b/debian/libkf5ktextaddons-dev.install
deleted file mode 100644
index 1e47f10..0000000
--- a/debian/libkf5ktextaddons-dev.install
+++ /dev/null
@@ -1,11 +0,0 @@
-usr/include/
-usr/lib/*/cmake/KF5TextAutoCorrectionCore/
-usr/lib/*/cmake/KF5TextAutoCorrectionWidgets/
-usr/lib/*/cmake/KF5TextEmoticonsCore/
-usr/lib/*/cmake/KF5TextEmoticonsWidgets/
-usr/lib/*/cmake/KF5TextGrammarCheck/
-usr/lib/*/cmake/KF5TextTranslator/
-usr/lib/*/cmake/KF5TextEditTextToSpeech/
-usr/lib/*/cmake/KF5TextAddonsWidgets/
-usr/lib/*/libKF5*.so
-usr/lib/*/qt5/mkspecs/
\ No newline at end of file
diff --git a/debian/libkf5textaddonswidgets1.install b/debian/libkf5textaddonswidgets1.install
deleted file mode 100644
index dbe6fb0..0000000
--- a/debian/libkf5textaddonswidgets1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libKF5TextAddonsWidgets.so.*
diff --git a/debian/libkf5textautocorrection1.install b/debian/libkf5textautocorrection1.install
deleted file mode 100644
index 698efba..0000000
--- a/debian/libkf5textautocorrection1.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libKF5TextAutoCorrectionCore.so.*
-usr/lib/*/libKF5TextAutoCorrectionWidgets.so.*
diff --git a/debian/libkf5textautocorrection1.lintian-overrides b/debian/libkf5textautocorrection1.lintian-overrides
deleted file mode 100644
index 4c93bd0..0000000
--- a/debian/libkf5textautocorrection1.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkf5textautocorrection1: package-name-doesnt-match-sonames libKF5TextAutoCorrectionCore1 libKF5TextAutoCorrectionWidgets1
\ No newline at end of file
diff --git a/debian/libkf5textedittexttospeech1.install b/debian/libkf5textedittexttospeech1.install
deleted file mode 100644
index 05335ad..0000000
--- a/debian/libkf5textedittexttospeech1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libKF5TextEditTextToSpeech.so.*
diff --git a/debian/libkf5textemoticons1.install b/debian/libkf5textemoticons1.install
deleted file mode 100644
index c048e77..0000000
--- a/debian/libkf5textemoticons1.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libKF5TextEmoticonsCore.so.*
-usr/lib/*/libKF5TextEmoticonsWidgets.so.*
diff --git a/debian/libkf5textemoticons1.lintian-overrides b/debian/libkf5textemoticons1.lintian-overrides
deleted file mode 100644
index afcb74c..0000000
--- a/debian/libkf5textemoticons1.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkf5textemoticons1: package-name-doesnt-match-sonames libKF5TextEmoticonsCore1 libKF5TextEmoticonsWidgets1
diff --git a/debian/libkf5textgrammarcheck1.install b/debian/libkf5textgrammarcheck1.install
deleted file mode 100644
index 91d145f..0000000
--- a/debian/libkf5textgrammarcheck1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libKF5TextGrammarCheck.so.*
diff --git a/debian/libkf5texttranslator1.install b/debian/libkf5texttranslator1.install
deleted file mode 100644
index 0b6eb4d..0000000
--- a/debian/libkf5texttranslator1.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libKF5TextTranslator.so.*
-usr/lib/*/qt5/plugins/
diff --git a/debian/rules b/debian/rules
index ac8dada..fa0af1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,7 @@
 # -*- makefile -*-
 
 %:
-	dh $@ --with kf5 --with pkgkde_symbolshelper --buildsystem kf5 
-
-override_dh_auto_test:
-	true
+	dh $@ --with kf6 --buildsystem kf6
 
 override_dh_shlibdeps:
-	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
+	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
diff --git a/debian/watch b/debian/watch
index 28fcac6..7098916 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
 version=4
-http://download.kde.org/stable/ktextaddons/@PACKAGE@-([\d.]+).tar.xz
+
+opts=pgpsigurlmangle=s/$/.sig/ https://download.kde.org/stable/frameworks/([\d.]+)/ktextaddons-([\d.]+)\.tar\.xz
+


More information about the Neon-commits mailing list