[neon/kf6/kquickcharts/Neon/unstable] debian: kf sixy
Jonathan Esk-Riddell
null at kde.org
Mon Jan 23 15:41:52 GMT 2023
Git commit 1e56163d579ed1570b8eec29aa0b49aea15e54a7 by Jonathan Esk-Riddell.
Committed on 23/01/2023 at 15:41.
Pushed by jriddell into branch 'Neon/unstable'.
kf sixy
M +2 -176 debian/changelog
D +0 -1 debian/compat
M +33 -28 debian/control
A +1 -0 debian/kf6-kquickcharts-dev.install
A +2 -0 debian/kf6-kquickcharts.install
D +0 -1 debian/kquickcharts-dev.install
D +0 -2 debian/qml-module-org-kde-quickcharts.install
M +3 -6 debian/rules
D +0 -9 debian/salsa-ci.yml
https://invent.kde.org/neon/kf6/kquickcharts/commit/1e56163d579ed1570b8eec29aa0b49aea15e54a7
diff --git a/debian/changelog b/debian/changelog
index f87046d..662f972 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,179 +1,5 @@
-kquickcharts (5.92.0-0neon) focal; urgency=medium
+kf6-kquickcharts (0.0-0neon) UNRELEASED; urgency=medium
* New release
- -- Neon CI <neon at kde.org> Tue, 15 Mar 2022 13:43:06 +0000
-
-kquickcharts (5.91.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Wed, 12 Jan 2022 22:11:50 +0000
-
-kquickcharts (5.89.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sat, 11 Dec 2021 10:28:56 +0000
-
-kquickcharts (5.88.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Mon, 15 Nov 2021 21:53:46 +0000
-
-kquickcharts (5.87.0-0neon) focal; urgency=medium
-
- [ Jonathan Riddell ]
- * new release
-
- [ Neon CI ]
- * New release
-
- -- Neon CI <neon at kde.org> Sun, 03 Oct 2021 15:25:10 +0000
-
-kquickcharts (5.85.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sun, 15 Aug 2021 10:10:52 +0000
-
-kquickcharts (5.84.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Mon, 12 Jul 2021 12:19:28 +0000
-
-kquickcharts (5.83.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Fri, 11 Jun 2021 21:28:32 +0000
-
-kquickcharts (5.82.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Tue, 11 May 2021 10:17:57 +0000
-
-kquickcharts (5.81.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sun, 11 Apr 2021 18:12:40 +0000
-
-kquickcharts (5.80.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sun, 14 Mar 2021 14:18:46 +0000
-
-kquickcharts (5.79.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Thu, 11 Feb 2021 13:58:51 +0000
-
-kquickcharts (5.78.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sat, 09 Jan 2021 12:25:27 +0000
-
-kquickcharts (5.77.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sat, 12 Dec 2020 14:07:06 +0000
-
-kquickcharts (5.76.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Thu, 19 Nov 2020 11:32:30 +0000
-
-kquickcharts (5.75.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Fri, 09 Oct 2020 13:43:06 +0000
-
-kquickcharts (5.74.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Thu, 10 Sep 2020 13:32:40 +0000
-
-kquickcharts (5.73.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Mon, 17 Aug 2020 19:25:32 +0000
-
-kquickcharts (5.72.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sat, 11 Jul 2020 15:38:13 +0000
-
-kquickcharts (5.71.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Fri, 12 Jun 2020 18:54:09 +0000
-
-kquickcharts (5.70.0-0neon) bionic; urgency=medium
-
- [ Sandro Knauß ]
- * Update Maintainer field to Debian/Kubuntu Qt/KDE Maintainers.
- * Add myself to Uploaders.
- * Add Vcs fields.
- * Bump compat level to 13.
- * Bump Standards-Version to 4.5.0 (No changes needed).
- * Add Rules-Requires-Root field to control.
- * Update build-deps and deps with the info from cmake.
- * Replace rules file with Frameworks standard.
- * Enable autotests.
- * Add Bug-* entries to metadata file.
- * Cleanup copyright file.
-
- [ Neon CI ]
- * New release
-
- -- Neon CI <neon at kde.org> Fri, 08 May 2020 15:42:24 +0000
-
-kquickcharts (5.69.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sun, 05 Apr 2020 05:01:05 +0000
-
-kquickcharts (5.68.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sun, 08 Mar 2020 05:01:08 +0000
-
-kquickcharts (5.67.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Mon, 03 Feb 2020 05:01:04 +0000
-
-kquickcharts (5.66.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sun, 05 Jan 2020 05:01:04 +0000
-
-kquickcharts (5.65.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Wed, 11 Dec 2019 05:01:07 +0000
-
-kquickcharts (0.1-1) unstable; urgency=medium
-
- * Initial release
-
- -- Bhushan Shah <bshah at kde.org> Thu, 23 May 2019 12:35:45 +0000
+ -- Jonathan Esk-Riddell <jr at jriddell.org> Mon, 12 Dec 2022 13:04:30 +0000
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 c388bb5..df56a0f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,19 +1,14 @@
-Source: kquickcharts
+Source: kf6-kquickcharts
Section: libs
Priority: optional
-Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Sandro Knauß <hefee at debian.org>
-Build-Depends: cmake (>= 3.5~),
- debhelper (>= 12),
- extra-cmake-modules (>= 5.69.0~),
- kirigami2-dev,
- libkf5declarative-dev,
- pkg-kde-tools,
- qml-module-qttest,
- qt5-qmake,
- qtbase5-dev,
- qtdeclarative5-dev (>= 5.12.0~),
- qtquickcontrols2-5-dev (>= 5.12.0~),
+Maintainer: Jonathan Esk-Riddell <jr at jriddell.org>
+Build-Depends: cmake,
+ debhelper-compat (= 13),
+ kf6-extra-cmake-modules,
+ kf6-kirigami2-dev,
+ pkg-kde-tools-neon,
+ qt6-base-dev,
+ qt6-declarative-dev,
xauth,
xvfb
Standards-Version: 4.5.0
@@ -22,27 +17,37 @@ Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kquickcharts
Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kquickcharts.git
Rules-Requires-Root: no
-Package: kquickcharts-dev
+Package: kf6-kquickcharts
Architecture: any
-Depends: qml-module-org-kde-quickcharts (= ${binary:Version}),
- qtbase5-dev,
- qtdeclarative5-dev (>= 5.12.0~),
- ${misc:Depends},
+Section: kde
+X-Neon-MergedPackage: true
+Depends: ${misc:Depends},
${shlibs:Depends}
-Description: Quick Charts - development files
+Description: Quick Charts
A QtQuick plugin providing high-performance charts.
.
- This package contains the development files.
+ This package contain the runtime qml module.
-Package: qml-module-org-kde-quickcharts
+Package: kf6-kquickcharts-dev
Architecture: any
-Depends: qml-module-org-kde-kirigami2,
- qml-module-qtquick-controls,
- qml-module-qtquick-layouts,
- qml-module-qtquick2,
+Section: kde
+X-Neon-MergedPackage: true
+Depends: kf6-kquickcharts (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Description: Quick Charts
+Description: Quick Charts - development files
A QtQuick plugin providing high-performance charts.
.
- This package contain the runtime qml module.
+ This package contains the development files.
+
+Package: qml-module-org-kde-quickcharts
+Architecture: all
+Depends: kf6-kquickcharts
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: kquickcharts-dev
+Architecture: all
+Depends: kf6-kquickcharts-dev
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/kf6-kquickcharts-dev.install b/debian/kf6-kquickcharts-dev.install
new file mode 100644
index 0000000..a5aea40
--- /dev/null
+++ b/debian/kf6-kquickcharts-dev.install
@@ -0,0 +1 @@
+usr/kf6/lib/*/cmake/KF5QuickCharts
diff --git a/debian/kf6-kquickcharts.install b/debian/kf6-kquickcharts.install
new file mode 100644
index 0000000..6e31926
--- /dev/null
+++ b/debian/kf6-kquickcharts.install
@@ -0,0 +1,2 @@
+usr/kf6/lib/*/qt5/
+usr/kf6/share/qlogging-categories6/kquickcharts.categories
diff --git a/debian/kquickcharts-dev.install b/debian/kquickcharts-dev.install
deleted file mode 100644
index 9603b4e..0000000
--- a/debian/kquickcharts-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/cmake/KF5QuickCharts
diff --git a/debian/qml-module-org-kde-quickcharts.install b/debian/qml-module-org-kde-quickcharts.install
deleted file mode 100644
index 2b9a196..0000000
--- a/debian/qml-module-org-kde-quickcharts.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/qt5/
-usr/share/qlogging-categories5/kquickcharts.categories
diff --git a/debian/rules b/debian/rules
index 8a6da4c..fa0af1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,8 @@
#!/usr/bin/make -f
# -*- makefile -*-
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
%:
- dh $@ --with kf5,pkgkde_symbolshelper,sodeps --buildsystem kf5 --without build_stamp
+ dh $@ --with kf6 --buildsystem kf6
-override_dh_auto_test:
- xvfb-run -a --server-args="-screen 0 1024x768x24 +extension GLX" --\
- dh_auto_test --no-parallel
+override_dh_shlibdeps:
+ dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
deleted file mode 100644
index ff55d43..0000000
--- a/debian/salsa-ci.yml
+++ /dev/null
@@ -1,9 +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'
- EXTRA_REPOSITORY: 'debian/salsa/extra_repository.list'
- EXTRA_REPOSITORY_KEY: 'debian/salsa/qt-kde-team.debian.net.asc'
More information about the Neon-commits
mailing list