[neon/kde/kio-gdrive/Neon/unstable] debian: kf6ify

Carlos De Maine null at kde.org
Thu Dec 14 02:31:13 GMT 2023


Git commit b5e02bb19c33487cdaf47627cb35090b6f814302 by Carlos De Maine.
Committed on 14/12/2023 at 03:31.
Pushed by carlosdem into branch 'Neon/unstable'.

kf6ify

D  +0    -13   debian/README.source
D  +0    -1    debian/compat
M  +18   -18   debian/control
M  +3    -1    debian/rules
D  +0    -7    debian/salsa-ci.yml

https://invent.kde.org/neon/kde/kio-gdrive/-/commit/b5e02bb19c33487cdaf47627cb35090b6f814302

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index c66eeb7..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,13 +0,0 @@
-If bin:kio-drive had runtime detection of kaccounts | qt5keychain then
-kaccount-integration could be a Recommends; however, at this time
-kio-gdrive compiled with kaccounts does not appear to function without
-kaccounts-integration, so kaccounts-integration has been promoted to a
-Depends.  Furthermore, because src:kio-drive prefers building against
-libkaccounts-dev and qt5keychain-dev is not used, qt5keychain-dev has
-been dropped as a Build-Depends.
-
-If runtime detection is implemented, then qt5cheychain-dev should be
-restored as a Build-Depends and the question of demoting
-kaccounts-integration to a Recommends should be revisited.
-
- -- Nicholas D Steeves <nsteeves at gmail.com>, Mon,  9 Apr 2018 14:51:56 -0400
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 48082f7..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-12
diff --git a/debian/control b/debian/control
index 8c02f09..8dee6e5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,22 +3,20 @@ Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Nicholas D Steeves <nsteeves at gmail.com>
-Build-Depends:
- cmake (>= 3.0.0~),
- debhelper (>= 12),
- extra-cmake-modules (>= 5.14.0~),
- intltool,
- libaccounts-glib-dev,
- libkaccounts5-dev,
- libkf5doctools-dev (>= 5.48.0~),
- libkf5kio-dev (>= 5.48.0~),
- libkf5notifications-dev (>= 5.48.0~),
- libkpimgapi5-dev,
- libkf5purpose-dev,
- pkg-config,
- pkg-kde-tools (>= 0.15.24~),
- qtbase5-dev (>= 5.2.0~),
-Standards-Version: 4.5.0
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               kf6-extra-cmake-modules,
+               kf6-kdoctools-dev,
+               kf6-kio-dev,
+               kf6-knotifications-dev,
+               kf6-purpose-dev,
+               kpim6-libkgapi-dev,
+               libaccounts-glib-dev,
+               libkaccounts-dev,
+               pkg-config,
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://community.kde.org/KIO_GDrive
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kio-gdrive.git
@@ -26,8 +24,10 @@ Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/kio-gdrive
 
 Package: kio-gdrive
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
- kaccounts5-integration
+Depends: kaccounts6-integration,
+         ${misc:Depends}, 
+         ${shlibs:Depends},
+ 
 Enhances: dolphin
 Description: KIO access for GDrive
  KIO GDrive enables KIO-aware applications (such as Dolphin, Kate
diff --git a/debian/rules b/debian/rules
index 28858f7..49552b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,6 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@ --with kf5
+	dh $@ --with kf6 --buildsystem kf6
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
deleted file mode 100644
index f71bdf3..0000000
--- a/debian/salsa-ci.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-include:
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
-variables:
-  SALSA_CI_DISABLE_MISSING_BREAKS: 'no'
-  SALSA_CI_DISABLE_RC_BUGS: 'no'
-  SALSA_CI_REPROTEST_ARGS: '--variations=-build-path'


More information about the Neon-commits mailing list