[neon/kde/kaccounts-integration/Neon/unstable] debian: clean up
Carlos De Maine
null at kde.org
Wed Dec 6 06:58:43 GMT 2023
Git commit b9cf55e71e0ef031552862c48363a087f4da5404 by Carlos De Maine.
Committed on 06/12/2023 at 07:58.
Pushed by carlosdem into branch 'Neon/unstable'.
clean up
M +1 -1 debian/changelog
M +56 -28 debian/control
R +0 -0 debian/kaccounts-integration-dev.install [from: debian/libkaccounts6-dev.install - 100% similarity]
A +6 -0 debian/kaccounts-integration.install
A +1 -0 debian/kaccounts-integration.lintian-overrides
D +0 -5 debian/kaccounts6-integration.install
D +0 -2 debian/libkaccounts6-2.install
D +0 -1 debian/libkaccounts6-2.lintian-overrides
D +0 -4 debian/qml6-module-org-kde-kaccounts.install
https://invent.kde.org/neon/kde/kaccounts-integration/-/commit/b9cf55e71e0ef031552862c48363a087f4da5404
diff --git a/debian/changelog b/debian/changelog
index 0b8083e..50f8525 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kaccounts6-integration (4:23.04.2-0neon) jammy; urgency=medium
+kaccounts-integration (4:23.04.2-0neon) jammy; urgency=medium
* Initial package
diff --git a/debian/control b/debian/control
index 2c088b2..1b674fd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: kaccounts6-integration
+Source: kaccounts-integration
Section: kde
Priority: optional
Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
@@ -26,17 +26,17 @@ Build-Depends: cmake,
qcoro-qt6-dev,
qt6-base-dev,
qt6-declarative-dev,
- libsignon-qt6-dev,
xauth,
xvfb
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
Homepage: https://projects.kde.org/projects/kde/kdenetwork/kaccounts-integration
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kaccounts-integration
Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kaccounts-integration.git
-Package: kaccounts6-integration
-Architecture: any
-Depends: libkaccounts6-2 (= ${binary:Version}),
+Package: kaccounts-integration
+X-Neon-MergedPackage: true
+Multi-Arch: same
+Depends: libkaccounts (= ${binary:Version}),
qml6-module-org-kde-kaccounts,
qml6-module-org-kde-kcm,
# signon-kwallet6-extension,
@@ -46,44 +46,72 @@ Depends: libkaccounts6-2 (= ${binary:Version}),
signond,
${misc:Depends},
${shlibs:Depends}
+Provides: kaccounts6-integration,
+ libkaccounts2,
+ libkaccounts6-2,
+ qml6-module-org-kde-kaccounts
+Replaces: kaccounts6-integration,
+ libkaccounts2,
+ libkaccounts6-2,
+ qml6-module-org-kde-kaccounts
Description: System to administer web accounts
Small system to administer web accounts for the sites and services
across the Plasma desktop, including: Google, Facebook, Owncloud, IMAP,
Jabber and others.
-Package: libkaccounts6-dev
-Section: libdevel
-Architecture: any
-Depends: libaccounts-glib-dev,
- libaccounts-qt6-dev,
- libkaccounts6-2 (= ${binary:Version}),
+Package: kaccounts-integration-dev
+X-Neon-MergedPackage: true
+Multi-Arch: same
+Depends: kaccounts-integration(= ${binary:Version}),
kf6-kcoreaddons-dev,
+ libaccounts-glib-dev,
+ libaccounts-qt6-dev,
libsignon-qt6-dev,
pkg-config,
${misc:Depends},
${shlibs:Depends}
+Provides: libkaccounts-dev,
+ libkaccounts6-dev
+Replaces: libkaccounts-dev,
+ libkaccounts6-dev
Description: System to administer web accounts - development files
Small system to administer web accounts for the sites and services across the
Plasma desktop, including: Google, Facebook, Owncloud, IMAP, Jabber and others.
.
This package contains the Qt6 based development files.
+Package: kaccounts6-integration
+Architecture: all
+Depends: kaccounts-integration, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkaccounts2
+Architecture: all
+Depends: kaccounts-integration, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkaccounts-dev
+Architecture: all
+Depends: kaccounts-integration-dev, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
Package: libkaccounts6-2
-Section: libs
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: System to administer web accounts - shared library
- Small system to administer web accounts for the sites and services across the
- Plasma desktop, including: Google, Facebook, Owncloud, IMAP, Jabber and others.
- .
- This package contains the Qt6 shared library.
+Architecture: all
+Depends: kaccounts-integration, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkaccounts6-dev
+Architecture: all
+Depends: kaccounts-integration-dev, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
Package: qml6-module-org-kde-kaccounts
-Architecture: any
-Multi-arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: KAccounts QtDeclarative QML6 Support
- Contains a plugin for QtDeclarative that provides
- support for using KAccounts components written
- in QML.
+Architecture: all
+Depends: kaccounts-integration, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/libkaccounts6-dev.install b/debian/kaccounts-integration-dev.install
similarity index 100%
rename from debian/libkaccounts6-dev.install
rename to debian/kaccounts-integration-dev.install
diff --git a/debian/kaccounts-integration.install b/debian/kaccounts-integration.install
new file mode 100644
index 0000000..f1a5a84
--- /dev/null
+++ b/debian/kaccounts-integration.install
@@ -0,0 +1,6 @@
+usr/lib/*/libkaccounts.so.*.*
+usr/lib/*/libkaccounts.so.2
+usr/lib/*/qt6/plugins/
+usr/lib/*/qt6/qml/
+usr/share/applications/kcm_kaccounts.desktop
+usr/share/locale/
diff --git a/debian/kaccounts-integration.lintian-overrides b/debian/kaccounts-integration.lintian-overrides
new file mode 100644
index 0000000..5679026
--- /dev/null
+++ b/debian/kaccounts-integration.lintian-overrides
@@ -0,0 +1 @@
+kaccounts-integration: package-name-doesnt-match-sonames libkaccounts2
diff --git a/debian/kaccounts6-integration.install b/debian/kaccounts6-integration.install
deleted file mode 100644
index c1e263d..0000000
--- a/debian/kaccounts6-integration.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/*/qt6/plugins/kaccounts/daemonplugins/kaccounts_kio_webdav_plugin.so
-usr/lib/*/qt6/plugins/kf6/kded/kded_accounts.so
-usr/lib/*/qt6/plugins/plasma/kcms/systemsettings/kcm_kaccounts.so
-usr/share/applications/kcm_kaccounts.desktop
-usr/share/locale/
diff --git a/debian/libkaccounts6-2.install b/debian/libkaccounts6-2.install
deleted file mode 100644
index 9c4b587..0000000
--- a/debian/libkaccounts6-2.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libkaccounts.so.*.*
-usr/lib/*/libkaccounts.so.2
diff --git a/debian/libkaccounts6-2.lintian-overrides b/debian/libkaccounts6-2.lintian-overrides
deleted file mode 100644
index dc07abf..0000000
--- a/debian/libkaccounts6-2.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkaccounts6-2: package-name-doesnt-match-sonames libkaccounts2
diff --git a/debian/qml6-module-org-kde-kaccounts.install b/debian/qml6-module-org-kde-kaccounts.install
deleted file mode 100644
index 0b6094f..0000000
--- a/debian/qml6-module-org-kde-kaccounts.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/*/qt6/qml/org/kde/kaccounts/libkaccountsdeclarativeplugin.so
-usr/lib/*/qt6/qml/org/kde/kaccounts/qmldir
-usr/lib/*/qt6/qml/org/kde/kaccounts/kaccountsdeclarativeplugin.qmltypes
-usr/lib/*/qt6/qml/org/kde/kaccounts/kde-qmlmodule.version
More information about the Neon-commits
mailing list