[neon/kde/baloo-widgets/Neon/unstable] debian: baloo-widgets is now qt6/kf6
Carlos De Maine
null at kde.org
Mon Jan 15 23:25:35 GMT 2024
Git commit 4b9f61a0d4f4e19abeb6c1f2fa04b08b7e1f5f01 by Carlos De Maine.
Committed on 16/01/2024 at 00:25.
Pushed by carlosdem into branch 'Neon/unstable'.
baloo-widgets is now qt6/kf6
D +0 -1 debian/compat
M +54 -42 debian/control
A +3 -0 debian/kf6-baloowidgets-dev.install
A +7 -0 debian/kf6-baloowidgets.install
D +0 -3 debian/libkf5baloowidgets-bin.install
D +0 -21 debian/libkf5baloowidgets-dev.acc.in
D +0 -3 debian/libkf5baloowidgets-dev.install
D +0 -4 debian/libkf5baloowidgets5.install
D +0 -84 debian/libkf5baloowidgets5.symbols
M +4 -7 debian/rules
D +0 -11 debian/tests/acc
D +0 -3 debian/tests/control
D +0 -3 debian/tests/testsuite
https://invent.kde.org/neon/kde/baloo-widgets/-/commit/4b9f61a0d4f4e19abeb6c1f2fa04b08b7e1f5f01
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 871283b..5065c68 100644
--- a/debian/control
+++ b/debian/control
@@ -3,61 +3,73 @@ Section: libs
Priority: optional
Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Maximiliano Curia <maxy at debian.org>
-Build-Depends: baloo-kf5-dev (>= 5.43.0~),
- cmake (>= 2.8.12~),
- debhelper (>= 11~),
- extra-cmake-modules (>= 0.0.14~),
- libkf5config-dev (>= 5.43.0~),
- libkf5filemetadata-dev (>= 5.43.0~),
- libkf5i18n-dev (>= 5.43.0~),
- libkf5kio-dev (>= 5.43.0~),
- pkg-kde-tools,
- qtbase5-dev (>= 5.8.0~)
-Standards-Version: 4.2.1
+Build-Depends: cmake,
+ debhelper-compat (= 13),
+ kf6-baloo-dev,
+ kf6-extra-cmake-modules,
+ kf6-kconfig-dev,
+ kf6-kfilemetadata-dev,
+ kf6-ki18n-dev,
+ kf6-kio-dev,
+ pkg-kde-tools-neon,
+ qt6-base-dev
+Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/baloo-widgets
Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/baloo-widgets.git
Homepage: http://projects.kde.org/baloo-widgets
-Package: libkf5baloowidgets-bin
+Package: kf6-baloowidgets
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Wigets for use with Baloo - binaries
+Section: kde
+X-Neon-MergedPackage: true
+Provides: libkf6baloowidgets6,
+ likf6baloowidgets-bin,
+ likf6baloowidgets-data,
+Replaces: libkf6baloowidgets6,
+ likf6baloowidgets-bin,
+ likf6baloowidgets-data,
+Depends: kf6-kfilemetadata,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Wigets for use with Baloo
Baloo is a framework for searching and managing metadata.
.
- This package contains binaries used by the baloo widgets library.
+ This package contains GUI widgets for baloo.
-Package: libkf5baloowidgets-dev
-Section: libdevel
+Package: kf6-baloowidgets-dev
Architecture: any
-Multi-Arch: same
-Depends: libkf5baloowidgets5 (= ${binary:Version}),
- libkf5kio-dev (>= 5.19~),
+Section: kde
+X-Neon-MergedPackage: true
+Provides: libkf6baloowidgets-dev
+Replaces: libkf6baloowidgets-dev
+Depends: kf6-baloowidgets (= ${binary:Version}),
+ kf6-kio-dev,
${misc:Depends}
Description: Development headers for developing applications with Baloo
Baloo is a framework for searching and managing metadata.
.
This package contains development headers for Baloo Widgets library.
-Package: libkf5baloowidgets5
-Architecture: any
-Multi-Arch: same
-Depends: libkf5filemetadata-bin, ${misc:Depends}, ${shlibs:Depends}
-Breaks: dolphin (<< 4:17.08),
- libkf5baloowidgets-data (<< 4:19.08.0-1),
- ${kde-l10n:all}
-Replaces: libkf5baloowidgets-data (<< 4:19.08.0-1), ${kde-l10n:all}
-Recommends: libkf5baloowidgets-bin
-Description: Wigets for use with Baloo
- Baloo is a framework for searching and managing metadata.
- .
- This package contains GUI widgets for baloo.
+Package: libkf6baloowidgets6
+Architecture: all
+Depends: kf6-baloowidgets
+Description: Dummy transitional
+ Transitional dummy package.
-Package: libkf5baloowidgets-data
-Architecture: any
-Priority: extra
-Section: oldlibs
-Depends: libkf5baloowidgets5
-Description: Wigets for use with Baloo - transitional
- Baloo is a framework for searching and managing metadata.
- .
- This package contains GUI widgets for baloo.
+Package: libkf6baloowidgets-dev
+Architecture: all
+Depends: kf6-baloowidgets-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: likf6baloowidgets-bin
+Architecture: all
+Depends: kf6-baloowidgets
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf6baloowidgets-data
+Architecture: all
+Depends: kf6-baloowidgets
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/kf6-baloowidgets-dev.install b/debian/kf6-baloowidgets-dev.install
new file mode 100644
index 0000000..a1a86bd
--- /dev/null
+++ b/debian/kf6-baloowidgets-dev.install
@@ -0,0 +1,3 @@
+usr/include/KF6/BalooWidgets
+usr/lib/*/cmake
+usr/lib/*/libKF6BalooWidgets.so
diff --git a/debian/kf6-baloowidgets.install b/debian/kf6-baloowidgets.install
new file mode 100644
index 0000000..fad7bcf
--- /dev/null
+++ b/debian/kf6-baloowidgets.install
@@ -0,0 +1,7 @@
+usr/bin/baloo_filemetadata_temp_extractor
+usr/lib/*/libKF6BalooWidgets.so.*.*
+usr/lib/*/libKF6BalooWidgets.so.6
+usr/lib/*/qt6/plugins/kf6/kfileitemaction/tagsfileitemaction.so
+usr/lib/*/qt6/plugins/kf6/propertiesdialog/baloofilepropertiesplugin.so
+usr/share/locale/
+usr/share/qlogging-categories6/baloo-widgets.categories
diff --git a/debian/libkf5baloowidgets-bin.install b/debian/libkf5baloowidgets-bin.install
deleted file mode 100644
index ab5e2f8..0000000
--- a/debian/libkf5baloowidgets-bin.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/baloo_filemetadata_temp_extractor
-usr/lib/*/qt5/plugins/kf5/kfileitemaction/tagsfileitemaction.so
-usr/lib/*/qt5/plugins/kf5/propertiesdialog/baloofilepropertiesplugin.so
diff --git a/debian/libkf5baloowidgets-dev.acc.in b/debian/libkf5baloowidgets-dev.acc.in
deleted file mode 100644
index 7b704ce..0000000
--- a/debian/libkf5baloowidgets-dev.acc.in
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<descriptor>
-
-<version>
- 15.08.0
-</version>
-
-<headers>
- /usr/include/KF5/BalooWidgets
-</headers>
-
-<libs>
- /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5BalooWidgets.so
-</libs>
-
-<gcc_options>
- -fPIC
- -I/usr/lib/@@DEB_HOST_MULTIARCH@@/qt5/mkspecs/common/posix/
-</gcc_options>
-
-</descriptor>
diff --git a/debian/libkf5baloowidgets-dev.install b/debian/libkf5baloowidgets-dev.install
deleted file mode 100644
index 97328ab..0000000
--- a/debian/libkf5baloowidgets-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/KF5/BalooWidgets
-usr/lib/*/cmake
-usr/lib/*/libKF5BalooWidgets.so
diff --git a/debian/libkf5baloowidgets5.install b/debian/libkf5baloowidgets5.install
deleted file mode 100644
index 0bdb73f..0000000
--- a/debian/libkf5baloowidgets5.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/*/libKF5BalooWidgets.so.*.*
-usr/lib/*/libKF5BalooWidgets.so.5
-usr/share/locale/
-usr/share/qlogging-categories5/baloo-widgets.categories
diff --git a/debian/libkf5baloowidgets5.symbols b/debian/libkf5baloowidgets5.symbols
deleted file mode 100644
index 0ee6ee3..0000000
--- a/debian/libkf5baloowidgets5.symbols
+++ /dev/null
@@ -1,84 +0,0 @@
-# SymbolsHelper-Confirmed: 4:18.08.0 amd64
-libKF5BalooWidgets.so.5 libkf5baloowidgets5 #MINVER#
- _ZN5Baloo18FileMetaDataWidget11qt_metacallEN11QMetaObject4CallEiPPv at Base 15.08.0
- _ZN5Baloo18FileMetaDataWidget11qt_metacastEPKc at Base 15.08.0
- _ZN5Baloo18FileMetaDataWidget11setReadOnlyEb at Base 15.08.0
- _ZN5Baloo18FileMetaDataWidget12urlActivatedERK4QUrl at Base 15.08.0
- _ZN5Baloo18FileMetaDataWidget13setDateFormatENS_11DateFormatsE at Base 4:18.08.0
- _ZN5Baloo18FileMetaDataWidget16staticMetaObjectE at Base 15.08.0
- _ZN5Baloo18FileMetaDataWidget23metaDataRequestFinishedERK13KFileItemList at Base 15.08.0
- _ZN5Baloo18FileMetaDataWidget7Private10deleteRowsEv at Base 15.08.0
- _ZN5Baloo18FileMetaDataWidget7Private11createLabelERK7QStringS4_PS0_ at Base 4:18.08.0
- _ZN5Baloo18FileMetaDataWidget7Private17slotLinkActivatedERK7QString at Base 15.08.0
- _ZN5Baloo18FileMetaDataWidget7Private19slotLoadingFinishedEv at Base 15.08.0
- _ZN5Baloo18FileMetaDataWidget7Private21slotDataChangeStartedEv at Base 15.08.0
- _ZN5Baloo18FileMetaDataWidget7Private22slotDataChangeFinishedEv at Base 15.08.0
- _ZN5Baloo18FileMetaDataWidget7PrivateC1EPS0_ at Base 15.08.0
- _ZN5Baloo18FileMetaDataWidget7PrivateC2EPS0_ at Base 15.08.0
- _ZN5Baloo18FileMetaDataWidget7PrivateD1Ev at Base 15.08.0
- _ZN5Baloo18FileMetaDataWidget7PrivateD2Ev at Base 15.08.0
- _ZN5Baloo18FileMetaDataWidget8setItemsERK13KFileItemList at Base 15.08.0
- _ZN5Baloo18FileMetaDataWidgetC1EP7QWidget at Base 15.08.0
- _ZN5Baloo18FileMetaDataWidgetC2EP7QWidget at Base 15.08.0
- _ZN5Baloo18FileMetaDataWidgetD0Ev at Base 15.08.0
- _ZN5Baloo18FileMetaDataWidgetD1Ev at Base 15.08.0
- _ZN5Baloo18FileMetaDataWidgetD2Ev at Base 15.08.0
- _ZN5Baloo24FileMetaDataConfigWidget11qt_metacallEN11QMetaObject4CallEiPPv at Base 15.08.0
- _ZN5Baloo24FileMetaDataConfigWidget11qt_metacastEPKc at Base 15.08.0
- _ZN5Baloo24FileMetaDataConfigWidget16staticMetaObjectE at Base 15.08.0
- _ZN5Baloo24FileMetaDataConfigWidget4saveEv at Base 15.08.0
- _ZN5Baloo24FileMetaDataConfigWidget5eventEP6QEvent at Base 15.08.0
- _ZN5Baloo24FileMetaDataConfigWidget7Private12loadMetaDataEv at Base 15.08.0
- _ZN5Baloo24FileMetaDataConfigWidget7Private19slotLoadingFinishedEv at Base 15.08.0
- _ZN5Baloo24FileMetaDataConfigWidget7Private7addItemERK7QString at Base 15.08.0
- _ZN5Baloo24FileMetaDataConfigWidget7PrivateC1EPS0_ at Base 15.08.0
- _ZN5Baloo24FileMetaDataConfigWidget7PrivateC2EPS0_ at Base 15.08.0
- _ZN5Baloo24FileMetaDataConfigWidget7PrivateD1Ev at Base 15.08.0
- _ZN5Baloo24FileMetaDataConfigWidget7PrivateD2Ev at Base 15.08.0
- _ZN5Baloo24FileMetaDataConfigWidget8setItemsERK13KFileItemList at Base 15.08.0
- _ZN5Baloo24FileMetaDataConfigWidgetC1EP7QWidget at Base 15.08.0
- _ZN5Baloo24FileMetaDataConfigWidgetC2EP7QWidget at Base 15.08.0
- _ZN5Baloo24FileMetaDataConfigWidgetD0Ev at Base 15.08.0
- _ZN5Baloo24FileMetaDataConfigWidgetD1Ev at Base 15.08.0
- _ZN5Baloo24FileMetaDataConfigWidgetD2Ev at Base 15.08.0
- _ZN5Baloo9TagWidget10tagClickedERK7QString at Base 15.08.0
- _ZN5Baloo9TagWidget11qt_metacallEN11QMetaObject4CallEiPPv at Base 15.08.0
- _ZN5Baloo9TagWidget11qt_metacastEPKc at Base 15.08.0
- _ZN5Baloo9TagWidget11slotShowAllEv at Base 15.08.0
- _ZN5Baloo9TagWidget12setAlignmentE6QFlagsIN2Qt13AlignmentFlagEE at Base 15.08.0
- _ZN5Baloo9TagWidget12setReadyOnlyEb at Base 15.08.0
- _ZN5Baloo9TagWidget15setSelectedTagsERK11QStringList at Base 15.08.0
- _ZN5Baloo9TagWidget16selectionChangedERK11QStringList at Base 15.08.0
- _ZN5Baloo9TagWidget16staticMetaObjectE at Base 15.08.0
- _ZN5Baloo9TagWidget17slotTagUpdateDoneEv at Base 15.08.0
- _ZN5Baloo9TagWidget26slotKEditTagDialogFinishedEi at Base 15.08.0
- _ZN5Baloo9TagWidgetC1EP7QWidget at Base 15.08.0
- _ZN5Baloo9TagWidgetC2EP7QWidget at Base 15.08.0
- _ZN5Baloo9TagWidgetD0Ev at Base 15.08.0
- _ZN5Baloo9TagWidgetD1Ev at Base 15.08.0
- _ZN5Baloo9TagWidgetD2Ev at Base 15.08.0
- _ZNK5Baloo18FileMetaDataWidget10dateFormatEv at Base 4:18.08.0
- _ZNK5Baloo18FileMetaDataWidget10isReadOnlyEv at Base 15.08.0
- _ZNK5Baloo18FileMetaDataWidget10metaObjectEv at Base 15.08.0
- _ZNK5Baloo18FileMetaDataWidget5itemsEv at Base 15.08.0
- _ZNK5Baloo18FileMetaDataWidget7Private10sortedKeysERK4QMapI7QString8QVariantE at Base 15.08.0
- _ZNK5Baloo18FileMetaDataWidget8sizeHintEv at Base 15.08.0
- _ZNK5Baloo24FileMetaDataConfigWidget10metaObjectEv at Base 15.08.0
- _ZNK5Baloo24FileMetaDataConfigWidget5itemsEv at Base 15.08.0
- _ZNK5Baloo24FileMetaDataConfigWidget8sizeHintEv at Base 15.08.0
- _ZNK5Baloo9TagWidget10metaObjectEv at Base 15.08.0
- _ZNK5Baloo9TagWidget12selectedTagsEv at Base 15.08.0
- _ZNK5Baloo9TagWidget8readOnlyEv at Base 15.08.0
- _ZNK5Baloo9TagWidget9alignmentEv at Base 15.08.0
- _ZTIN5Baloo18FileMetaDataWidgetE at Base 15.08.0
- _ZTIN5Baloo24FileMetaDataConfigWidgetE at Base 15.08.0
- _ZTIN5Baloo9TagWidgetE at Base 15.08.0
- _ZTSN5Baloo18FileMetaDataWidgetE at Base 15.08.0
- _ZTSN5Baloo24FileMetaDataConfigWidgetE at Base 15.08.0
- _ZTSN5Baloo9TagWidgetE at Base 15.08.0
- _ZTVN5Baloo18FileMetaDataWidgetE at Base 15.08.0
- _ZTVN5Baloo24FileMetaDataConfigWidgetE at Base 15.08.0
- _ZTVN5Baloo9TagWidgetE at Base 15.08.0
- (c++)"non-virtual thunk to Baloo::FileMetaDataConfigWidget::~FileMetaDataConfigWidget()@Base" 15.08.0
- (c++)"non-virtual thunk to Baloo::FileMetaDataWidget::~FileMetaDataWidget()@Base" 15.08.0
- (c++)"non-virtual thunk to Baloo::TagWidget::~TagWidget()@Base" 15.08.0
diff --git a/debian/rules b/debian/rules
index 6701cfc..c8d276e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,9 @@
#!/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-5~
-
-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:
- dh_strip --dbgsym-migration='libkf5baloowidgets5-dbg (<= 15.12.0-1~~)'
+%:
+ dh $@ --with kf6 --buildsystem kf6
override_dh_auto_test:
# Disable unit tests at build time
diff --git a/debian/tests/acc b/debian/tests/acc
deleted file mode 100755
index f8dc629..0000000
--- a/debian/tests/acc
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-for in_file in debian/*.acc.in; do
- out_file=${in_file%.in}
- sed 's/@@DEB_HOST_MULTIARCH@@/'"${DEB_HOST_MULTIARCH}"'/' \
- "${in_file}" > "${out_file}"
-done
-
-dh_acc
diff --git a/debian/tests/control b/debian/tests/control
deleted file mode 100644
index 6ec07f5..0000000
--- a/debian/tests/control
+++ /dev/null
@@ -1,3 +0,0 @@
-Tests: testsuite
-Depends: build-essential, xauth, xvfb, @, @builddeps@
-Restrictions: build-needed
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
deleted file mode 100755
index 4d9b9b2..0000000
--- a/debian/tests/testsuite
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-xvfb-run -a --server-args="-screen 0 1024x768x24+32" dh_auto_test --no-parallel
More information about the Neon-commits
mailing list