[neon/kde/okular/Neon/experimental] debian: kf6ify
Carlos De Maine
null at kde.org
Tue Dec 12 10:31:33 GMT 2023
Git commit 0e137ffebd1e8b3ed9177ec38d57cb54c8fe91c7 by Carlos De Maine.
Committed on 12/12/2023 at 11:31.
Pushed by carlosdem into branch 'Neon/experimental'.
kf6ify
D +0 -1 debian/compat
M +74 -73 debian/control
D +0 -2 debian/libokular5core11.install
A +2 -0 debian/libokular6core11.install
M +24 -24 debian/okular-backends.install
D +0 -16 debian/okular-dev.acc.in
M +2 -2 debian/okular-dev.install
M +11 -11 debian/okular-extra-backends.install
M +2 -2 debian/okular.install
D +0 -1 debian/qml-module-org-kde-okular.install
A +1 -0 debian/qml6-module-org-kde-okular.install
M +4 -19 debian/rules
https://invent.kde.org/neon/kde/okular/-/commit/0e137ffebd1e8b3ed9177ec38d57cb54c8fe91c7
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 3c859b0..07a6746 100644
--- a/debian/control
+++ b/debian/control
@@ -3,65 +3,60 @@ Section: kde
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Eshat Cakar <info at eshat.de>, Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 2.8.12~),
- debhelper (>= 11~),
- extra-cmake-modules (>= 5.19.0~),
- kirigami2-dev,
+Build-Depends: cmake,
+ debhelper-compat (= 13),
+ kf6-extra-cmake-modules,
+ kf6-kirigami2-dev,
+ kf6-kactivities-dev,
+ kf6-karchive-dev,
+ kf6-kbookmarks-dev,
+ kf6-kcompletion-dev,
+ kf6-kconfig-dev,
+ kf6-kconfigwidgets-dev,
+ kf6-kcoreaddons-dev,
+ kf6-kcrash-dev,
+ kf6-kdoctools-dev,
+ kf6-kiconthemes-dev,
+ kf6-kexiv2-dev,
+ kf6-khtml-dev,
+ kf6-kio-dev,
+ kf6-kparts-dev,
+ kf6-kwallet-dev,
+ kf6-kwindowsystem-dev,
+ kf6-purpose-dev,
+ kf6-threadweaver-dev,
libchm-dev,
libdjvulibre-dev (>= 3.5.17~),
libepub-dev,
libfreetype6-dev,
libjpeg-dev,
- libkf5activities-dev (>= 5.33.0~),
- libkf5archive-dev (>= 5.33.0~),
- libkf5bookmarks-dev (>= 5.33.0~),
- libkf5completion-dev (>= 5.33.0~),
- libkf5config-dev (>= 5.33.0~),
- libkf5configwidgets-dev (>= 5.33.0~),
- libkf5coreaddons-dev (>= 5.33.0~),
- libkf5crash-dev (>= 5.33.0~),
- libkf5doctools-dev (>= 5.33.0~),
- libkf5iconthemes-dev (>= 5.33.0~),
- libkf5kexiv2-dev,
- libkf5khtml-dev,
- libkf5kio-dev (>= 5.33.0~),
- libkf5kjs-dev (>= 5.33.0~),
- libkf5parts-dev (>= 5.33.0~),
- libkf5pty-dev,
- libkf5purpose-dev,
- libkf5threadweaver-dev (>= 5.33.0~),
- libkf5wallet-dev (>= 5.33.0~),
- libkf5windowsystem-dev (>= 5.33.0~),
libmarkdown2-dev,
- libphonon4qt5-dev,
- libphonon4qt5experimental-dev,
- libpoppler-qt5-dev (>= 0.12.1~),
- libqca-qt5-2-dev (>= 2.1.0~),
- libqmobipocket-dev (>= 4:17.08~),
- libqt5svg5-dev (>= 5.8.0~),
- libqt5texttospeech5-dev (>= 5.8.0~),
- libqt5x11extras5-dev,
- libspectre-dev (>= 0.2~),
+ qt6-phonon-dev,
+ libpoppler-qt6-dev,
+ libqca-qt6-2-dev,
+ libqmobipocket-dev,
+ libspectre-dev,
libtiff-dev,
libx11-dev,
libzip-dev,
pkg-config,
- pkg-kde-tools,
- qtbase5-dev (>= 5.8.0~),
- qtbase5-private-dev,
- qtdeclarative5-dev (>= 5.8.0~),
- zlib1g-dev
-Standards-Version: 4.1.4
+ pkg-kde-tools-neon,
+ qt6-5compat-dev,
+ qt6-base-dev,
+ qt6-declarative-dev,
+ qt6-svg-dev,
+ qt6-speech-dev,zlib1g-dev
+Standards-Version: 4.6.2
Homepage: http://www.kde.org/
Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/okular.git
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/okular
-Package: libokular5core11
+Package: libokular6core11
Section: libs
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libokular5core10 (<< 4:23.08.0)
-Replaces: libokular5core10 (<< 4:23.08.0)
+Breaks: libokular5core11 (>= ${source:Version}~ciBuild)
+Replaces: libokular5core11 (>= ${source:Version}~ciBuild)
Description: libraries for the Okular document viewer
This package contains libraries used by the Okular document viewer.
.
@@ -70,7 +65,9 @@ Description: libraries for the Okular document viewer
Package: okular
Section: graphics
Architecture: any
-Depends: kinit, okular-backends, ${misc:Depends}, ${shlibs:Depends}
+Depends: okular-backends,
+ ${misc:Depends},
+ ${shlibs:Depends}
Recommends: cups-bsd
Suggests: ghostscript,
okular-extra-backends (= ${binary:Version}),
@@ -78,13 +75,6 @@ Suggests: ghostscript,
texlive-binaries,
unrar
Provides: pdf-viewer, postscript-viewer
-Breaks: kdegraphics-mobipocket (<< 4:4.12),
- okular-extra-backends (<< 4:16.12.0),
- okular-mobile (<< 4:17.04.1-0),
- ${kde-l10n:all}
-Replaces: okular-extra-backends (<< 4:16.12.0),
- okular-mobile (<< 4:17.04.1-0),
- ${kde-l10n:all}
Description: universal document viewer
Okular is a universal document viewer with support for advanced document
features, such as annotations, forms, and embedded files.
@@ -104,11 +94,11 @@ Description: universal document viewer
Package: okular-dev
Section: libdevel
Architecture: any
-Depends: libkf5config-dev (>= 5.33.0~),
- libkf5coreaddons-dev (>= 5.33.0~),
- libkf5xmlgui-dev,
- libokular5core11 (= ${binary:Version}),
- qtbase5-dev (>= 5.8.0~),
+Depends: kf6-kconfig-dev,
+ kf6-kcoreaddons-dev,
+ kf6-kxmlgui-dev,
+ libokular6core11 (= ${binary:Version}),
+ qt6-base-dev,
${misc:Depends}
Description: development files for the Okular libraries
This package contains development files for building Okular document format
@@ -118,10 +108,10 @@ Description: development files for the Okular libraries
Package: okular-backends
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: libokular6core11 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Recommends: okular
-Breaks: okular (<< 4:20.04.0), ${kde-l10n:all}
-Replaces: okular (<< 4:20.04.0), ${kde-l10n:all}
Description: document format support for Okular
These plugins allow Okular to view the following document formats:
* Portable Document Format (PDF)
@@ -138,8 +128,6 @@ Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: okular
Provides: djvu-viewer
-Breaks: okular (<< 4:19.08.0), okular-mobile (<< 4:19.08.0), ${kde-l10n:all}
-Replaces: okular (<< 4:19.08.0), okular-mobile (<< 4:19.08.0), ${kde-l10n:all}
Description: additional document format support for Okular
These plugins allow Okular to view additional document formats:
* Portable Document Format (PDF)
@@ -157,16 +145,15 @@ Description: additional document format support for Okular
.
This package is part of the KDE graphics module.
-Package: qml-module-org-kde-okular
+Package: qml6-module-org-kde-okular
Architecture: any
Depends: okular-backends,
- qml-module-org-kde-kirigami2,
- qml-module-qtgraphicaleffects,
- qml-module-qtquick-controls,
+ qml6-module-org-kde-kirigami,
+ qml6-module-qtquick-controls,
${misc:Depends},
${shlibs:Depends}
-Breaks: okular (<< 4:17.12.2~)
-Replaces: okular (<< 4:17.12.2~)
+Breaks: qml6-module-org-kde-okular (>= ${source:Version}~ciBuild)
+Replaces: qml6-module-org-kde-okular (>= ${source:Version}~ciBuild)
Description: mobile support for Okular - QML modules
This package contains the QML module for interfacing with the Okular core
library.
@@ -175,11 +162,10 @@ Description: mobile support for Okular - QML modules
Package: okular-mobile
Architecture: any
-Depends: qml-module-org-kde-kirigami2,
- qml-module-org-kde-kquickcontrolsaddons,
- qml-module-org-kde-okular (= ${binary:Version}),
- qml-module-qtgraphicaleffects,
- qml-module-qtquick-controls2,
+Depends: qml6-module-org-kde-kirigami,
+ qml6-module-org-kde-kquickcontrolsaddons,
+ qml6-module-org-kde-okular (= ${binary:Version}),
+ qml6-module-qtquick-controls,
${misc:Depends},
${shlibs:Depends}
Suggests: ghostscript,
@@ -187,10 +173,25 @@ Suggests: ghostscript,
poppler-data,
texlive-binaries,
unrar
-Breaks: ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
Description: Mobile user interface of Okular
Okular is a universal document viewer with support for advanced document
features, such as annotations, forms, and embedded files.
.
This package is part of the KDE graphics module.
+
+## transitionals below
+
+Package: libokular5core11
+Section: oldlibs
+Architecture: all
+Depends: libokular5core11 (>= ${source:Version}~ciBuild), ${misc:Depends}
+Description: Dummy transitional package.
+ This package can be safely removed.
+
+Package: qml6-module-org-kde-okular
+Section: oldlibs
+Architecture: all
+Depends: qml-module-org-kde-okular (>= ${source:Version}~ciBuild), ${misc:Depends}
+Description: Dummy transitional package.
+ This package can be safely removed.
+
diff --git a/debian/libokular5core11.install b/debian/libokular5core11.install
deleted file mode 100644
index 2ed0fa4..0000000
--- a/debian/libokular5core11.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libOkular5Core.so.*
-usr/lib/*/libOkular5Core.so.11
diff --git a/debian/libokular6core11.install b/debian/libokular6core11.install
new file mode 100644
index 0000000..b683b4f
--- /dev/null
+++ b/debian/libokular6core11.install
@@ -0,0 +1,2 @@
+usr/lib/*/libOkular6Core.so.*
+usr/lib/*/libOkular6Core.so.11
diff --git a/debian/okular-backends.install b/debian/okular-backends.install
index c6b0ab1..b18b95d 100644
--- a/debian/okular-backends.install
+++ b/debian/okular-backends.install
@@ -1,14 +1,14 @@
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_comicbook.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_dvi.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_fax.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_fb.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_ghostview.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_kimgio.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_mobi.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_plucker.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_poppler.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_txt.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_xps.so
+usr/lib/*/qt6/plugins/okular/generators/okularGenerator_comicbook.so
+usr/lib/*/qt6/plugins/okular/generators/okularGenerator_dvi.so
+usr/lib/*/qt6/plugins/okular/generators/okularGenerator_fax.so
+usr/lib/*/qt6/plugins/okular/generators/okularGenerator_fb.so
+usr/lib/*/qt6/plugins/okular/generators/okularGenerator_ghostview.so
+usr/lib/*/qt6/plugins/okular/generators/okularGenerator_kimgio.so
+usr/lib/*/qt6/plugins/okular/generators/okularGenerator_mobi.so
+usr/lib/*/qt6/plugins/okular/generators/okularGenerator_plucker.so
+usr/lib/*/qt6/plugins/okular/generators/okularGenerator_poppler.so
+usr/lib/*/qt6/plugins/okular/generators/okularGenerator_txt.so
+usr/lib/*/qt6/plugins/okular/generators/okularGenerator_xps.so
usr/share/applications/okularApplication_comicbook.desktop
usr/share/applications/okularApplication_dvi.desktop
usr/share/applications/okularApplication_fax.desktop
@@ -20,19 +20,19 @@ usr/share/applications/okularApplication_pdf.desktop
usr/share/applications/okularApplication_plucker.desktop
usr/share/applications/okularApplication_txt.desktop
usr/share/applications/okularApplication_xps.desktop
-usr/share/kservices5/okularComicbook.desktop
-usr/share/kservices5/okularDvi.desktop
-usr/share/kservices5/okularFax.desktop
-usr/share/kservices5/okularFb.desktop
-usr/share/kservices5/okularGhostview.desktop
-usr/share/kservices5/okularKimgio.desktop
-usr/share/kservices5/okularMobi.desktop
-usr/share/kservices5/okularPlucker.desktop
-usr/share/kservices5/okularPoppler.desktop
-usr/share/kservices5/okularTxt.desktop
-usr/share/kservices5/okularXps.desktop
-usr/share/kservices5/okular_part.desktop
-usr/share/kservicetypes5/okularGenerator.desktop
+usr/share/kservices6/okularComicbook.desktop
+usr/share/kservices6/okularDvi.desktop
+usr/share/kservices6/okularFax.desktop
+usr/share/kservices6/okularFb.desktop
+usr/share/kservices6/okularGhostview.desktop
+usr/share/kservices6/okularKimgio.desktop
+usr/share/kservices6/okularMobi.desktop
+usr/share/kservices6/okularPlucker.desktop
+usr/share/kservices6/okularPoppler.desktop
+usr/share/kservices6/okularTxt.desktop
+usr/share/kservices6/okularXps.desktop
+usr/share/kservices6/okular_part.desktop
+usr/share/kservicetypes6/okularGenerator.desktop
usr/share/locale/*/LC_MESSAGES/okular_comicbook.mo
usr/share/locale/*/LC_MESSAGES/okular_dvi.mo
usr/share/locale/*/LC_MESSAGES/okular_fax.mo
diff --git a/debian/okular-dev.acc.in b/debian/okular-dev.acc.in
deleted file mode 100644
index 5b011a2..0000000
--- a/debian/okular-dev.acc.in
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<descriptor>
-
-<version>
- 16.12.1
-</version>
-
-<headers>
- /usr/include/okular/core/
-</headers>
-
-<libs>
- /usr/lib/@@DEB_HOST_MULTIARCH@@/libOkular5Core.so
-</libs>
-
-</descriptor>
diff --git a/debian/okular-dev.install b/debian/okular-dev.install
index e1e60ca..3daf189 100644
--- a/debian/okular-dev.install
+++ b/debian/okular-dev.install
@@ -28,5 +28,5 @@ usr/include/okular/interfaces/guiinterface.h
usr/include/okular/interfaces/printinterface.h
usr/include/okular/interfaces/saveinterface.h
usr/include/okular/interfaces/viewerinterface.h
-usr/lib/*/cmake/Okular5/
-usr/lib/*/libOkular5Core.so
+usr/lib/*/cmake/Okular6/
+usr/lib/*/libOkular6Core.so
diff --git a/debian/okular-extra-backends.install b/debian/okular-extra-backends.install
index c1f357d..afcb0c3 100644
--- a/debian/okular-extra-backends.install
+++ b/debian/okular-extra-backends.install
@@ -1,9 +1,9 @@
-usr/lib/*/qt5/plugins/kf5/kio/kio_msits.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_chmlib.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_djvu.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_epub.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_md.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_tiff.so
+usr/lib/*/qt6/plugins/kf6/kio/kio_msits.so
+usr/lib/*/qt6/plugins/okular/generators/okularGenerator_chmlib.so
+usr/lib/*/qt6/plugins/okular/generators/okularGenerator_djvu.so
+usr/lib/*/qt6/plugins/okular/generators/okularGenerator_epub.so
+usr/lib/*/qt6/plugins/okular/generators/okularGenerator_md.so
+usr/lib/*/qt6/plugins/okular/generators/okularGenerator_tiff.so
usr/share/applications/okularApplication_chm.desktop
usr/share/applications/okularApplication_djvu.desktop
usr/share/applications/okularApplication_epub.desktop
@@ -14,11 +14,11 @@ usr/share/applications/org.kde.mobile.okular_djvu.desktop
usr/share/applications/org.kde.mobile.okular_epub.desktop
usr/share/applications/org.kde.mobile.okular_md.desktop
usr/share/applications/org.kde.mobile.okular_tiff.desktop
-usr/share/kservices5/okularChm.desktop
-usr/share/kservices5/okularDjvu.desktop
-usr/share/kservices5/okularEPub.desktop
-usr/share/kservices5/okularMd.desktop
-usr/share/kservices5/okularTiff.desktop
+usr/share/kservices6/okularChm.desktop
+usr/share/kservices6/okularDjvu.desktop
+usr/share/kservices6/okularEPub.desktop
+usr/share/kservices6/okularMd.desktop
+usr/share/kservices6/okularTiff.desktop
usr/share/locale/*/LC_MESSAGES/okular_chm.mo
usr/share/locale/*/LC_MESSAGES/okular_djvu.mo
usr/share/locale/*/LC_MESSAGES/okular_epub.mo
diff --git a/debian/okular.install b/debian/okular.install
index 730eeeb..5e46851 100644
--- a/debian/okular.install
+++ b/debian/okular.install
@@ -1,5 +1,5 @@
usr/bin/okular
-usr/lib/*/qt5/plugins/okularpart.so
+usr/lib/*/qt6/plugins/okularpart.so
usr/share/applications/org.kde.okular.desktop
usr/share/config.kcfg/gssettings.kcfg
usr/share/config.kcfg/okular.kcfg
@@ -16,4 +16,4 @@ usr/share/okular/icons/hicolor/*/apps/okular-fb2.png
usr/share/okular/icons/hicolor/*/apps/okular-gv.png
usr/share/okular/pics
usr/share/okular/tools.xml
-usr/share/qlogging-categories5/okular.categories
+usr/share/qlogging-categories6/okular.categories
diff --git a/debian/qml-module-org-kde-okular.install b/debian/qml-module-org-kde-okular.install
deleted file mode 100644
index 5639d65..0000000
--- a/debian/qml-module-org-kde-okular.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/qt5/qml/org/kde/okular/
diff --git a/debian/qml6-module-org-kde-okular.install b/debian/qml6-module-org-kde-okular.install
new file mode 100644
index 0000000..a31ff10
--- /dev/null
+++ b/debian/qml6-module-org-kde-okular.install
@@ -0,0 +1 @@
+usr/lib/*/qt6/qml/org/kde/okular/
diff --git a/debian/rules b/debian/rules
index d0bd9ea..49552b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +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-11~
-
-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
-
-override_dh_auto_configure:
- $(overridden_command) -- -DOKULAR_UI='both'
-
-override_dh_auto_test:
- # Disable dh_auto_test at build time
- :
-
-override_dh_strip:
- $(overridden_command) --dbgsym-migration='okular-dbg (<= 16.08.90-1~~)'
-
-override_dh_makeshlibs:
- $(overridden_command) -V
+%:
+ dh $@ --with kf6 --buildsystem kf6
More information about the Neon-commits
mailing list