[neon/kf6/qqc2-desktop-style/Neon/unstable] debian: kf sixy
Jonathan Esk-Riddell
null at kde.org
Tue Jan 24 12:05:07 GMT 2023
Git commit 5fe376b6e5b87dd1eb335990241d3d1a9af3ca14 by Jonathan Esk-Riddell.
Committed on 24/01/2023 at 12:05.
Pushed by jriddell into branch 'Neon/unstable'.
kf sixy
M +2 -362 debian/changelog
D +0 -1 debian/compat
M +32 -31 debian/control
A +1 -0 debian/kf6-qqc2-desktop-style-dev.install
A +2 -0 debian/kf6-qqc2-desktop-style.install
D +0 -3 debian/libkf5qqc2desktopstyle-dev.install
D +0 -3 debian/qml-module-org-kde-qqc2desktopstyle.install
M +4 -3 debian/rules
https://invent.kde.org/neon/kf6/qqc2-desktop-style/commit/5fe376b6e5b87dd1eb335990241d3d1a9af3ca14
diff --git a/debian/changelog b/debian/changelog
index 58708a2..7961088 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,365 +1,5 @@
-qqc2-desktop-style (5.92.0-0neon) focal; urgency=medium
+kf6-qqc2-desktop-style (0.0-0neon) UNRELEASED; urgency=medium
* New release
- -- Neon CI <neon at kde.org> Mon, 07 Mar 2022 11:39:41 +0000
-
-qqc2-desktop-style (5.91.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Tue, 11 Jan 2022 15:11:49 +0000
-
-qqc2-desktop-style (5.89.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sat, 11 Dec 2021 10:25:49 +0000
-
-qqc2-desktop-style (5.88.0-0neon) focal; urgency=medium
-
- [ Jonathan Riddell ]
- * new release
-
- [ Neon CI ]
- * New release
-
- -- Neon CI <neon at kde.org> Sun, 03 Oct 2021 02:06:05 +0000
-
-qqc2-desktop-style (5.85.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sun, 15 Aug 2021 10:11:49 +0000
-
-qqc2-desktop-style (5.84.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Mon, 12 Jul 2021 12:19:54 +0000
-
-qqc2-desktop-style (5.83.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Fri, 11 Jun 2021 21:29:43 +0000
-
-qqc2-desktop-style (5.82.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Tue, 11 May 2021 10:19:06 +0000
-
-qqc2-desktop-style (5.81.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sun, 11 Apr 2021 18:11:55 +0000
-
-qqc2-desktop-style (5.80.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sun, 14 Mar 2021 14:19:31 +0000
-
-qqc2-desktop-style (5.79.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Thu, 11 Feb 2021 13:59:48 +0000
-
-qqc2-desktop-style (5.78.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sat, 09 Jan 2021 12:27:36 +0000
-
-qqc2-desktop-style (5.77.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sat, 12 Dec 2020 14:08:51 +0000
-
-qqc2-desktop-style (5.76.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Thu, 19 Nov 2020 11:33:27 +0000
-
-qqc2-desktop-style (5.75.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Fri, 09 Oct 2020 13:44:08 +0000
-
-qqc2-desktop-style (5.74.0-0neon) focal; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Thu, 10 Sep 2020 13:33:21 +0000
-
-qqc2-desktop-style (5.73.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Mon, 17 Aug 2020 19:27:48 +0000
-
-qqc2-desktop-style (5.72.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sat, 11 Jul 2020 15:53:13 +0000
-
-qqc2-desktop-style (5.71.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Fri, 12 Jun 2020 18:58:16 +0000
-
-qqc2-desktop-style (5.70.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Fri, 08 May 2020 15:43:53 +0000
-
-qqc2-desktop-style (5.69.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sat, 11 Apr 2020 18:22:20 +0000
-
-qqc2-desktop-style (5.68.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Fri, 13 Mar 2020 13:24:15 +0000
-
-qqc2-desktop-style (5.67.1-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Wed, 04 Mar 2020 11:03:42 +0000
-
-qqc2-desktop-style (5.67.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Fri, 07 Feb 2020 21:06:58 +0000
-
-qqc2-desktop-style (5.66.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Fri, 10 Jan 2020 13:26:41 +0000
-
-qqc2-desktop-style (5.65.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Fri, 13 Dec 2019 17:38:31 +0000
-
-qqc2-desktop-style (5.64.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Fri, 08 Nov 2019 14:04:06 +0000
-
-qqc2-desktop-style (5.63.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Fri, 11 Oct 2019 21:24:52 +0000
-
-qqc2-desktop-style (5.62.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Mon, 16 Sep 2019 11:23:31 +0000
-
-qqc2-desktop-style (5.61.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sun, 11 Aug 2019 18:56:11 +0000
-
-qqc2-desktop-style (5.60.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sat, 13 Jul 2019 15:50:08 +0000
-
-qqc2-desktop-style (5.59.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Fri, 07 Jun 2019 18:14:02 +0000
-
-qqc2-desktop-style (5.58.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Fri, 10 May 2019 13:18:42 +0000
-
-qqc2-desktop-style (5.57.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Fri, 12 Apr 2019 08:46:09 +0000
-
-qqc2-desktop-style (5.56.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sat, 09 Mar 2019 16:01:43 +0000
-
-qqc2-desktop-style (5.55.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sun, 10 Feb 2019 22:38:14 +0000
-
-qqc2-desktop-style (5.54.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Fri, 11 Jan 2019 15:47:50 +0000
-
-qqc2-desktop-style (5.53.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Wed, 12 Dec 2018 10:42:35 +0000
-
-qqc2-desktop-style (5.52.0-0neon) bionic; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Sat, 10 Nov 2018 16:29:54 +0000
-
-qqc2-desktop-style (5.51.0-1) unstable; urgency=medium
-
- * New upstream release (5.50.0).
- * Update build-deps and deps with the info from cmake
- * Bump group breaks (5.50)
- * New upstream release (5.51.0).
- * Update build-deps and deps with the info from cmake
- * Bump group breaks (5.51)
- * Release to unstable
-
- -- Maximiliano Curia <maxy at debian.org> Wed, 07 Nov 2018 17:17:37 +0100
-
-qqc2-desktop-style (5.49.0-1) unstable; urgency=medium
-
- * New upstream release (5.48.0).
- * Update build-deps and deps with the info from cmake
- * New upstream release (5.49.0).
- * Update build-deps and deps with the info from cmake
- * Bump group breaks (5.49)
- * Release to unstable
-
- -- Maximiliano Curia <maxy at debian.org> Fri, 17 Aug 2018 16:19:17 +0200
-
-qqc2-desktop-style (5.47.0-1) unstable; urgency=medium
-
- * New revision
- * Add upstream metadata
- * New upstream release (5.47.0).
- * Update build-deps and deps with the info from cmake
- * Bump group breaks (5.47)
- * Release to unstable
-
- -- Maximiliano Curia <maxy at debian.org> Fri, 15 Jun 2018 12:11:08 +0200
-
-qqc2-desktop-style (5.46.2-1) unstable; urgency=medium
-
- * New upstream release (5.46.2).
- * Release to unstable
-
- -- Maximiliano Curia <maxy at debian.org> Fri, 18 May 2018 13:02:42 +0200
-
-qqc2-desktop-style (5.46.0-1) unstable; urgency=medium
-
- * New upstream release (5.46.0).
- * Update build-deps and deps with the info from cmake
- * Bump Standards-Version to 4.1.4.
- * Use https for the debian/copyright
- * Bump group breaks (5.46)
- * Release to unstable
-
- -- Maximiliano Curia <maxy at debian.org> Thu, 17 May 2018 22:15:55 +0200
-
-qqc2-desktop-style (5.45.0-1) unstable; urgency=medium
-
- * New upstream release (5.45.0).
- * Update build-deps and deps with the info from cmake
- * Bump group breaks (5.45)
- * Release to unstable
-
- -- Maximiliano Curia <maxy at debian.org> Sat, 05 May 2018 08:11:13 +0200
-
-qqc2-desktop-style (5.44.0-1) sid; urgency=medium
-
- * New upstream release (5.44.0).
- * Update build-deps and deps with the info from cmake
- * Bump group breaks (5.44)
- * Release to sid
-
- -- Maximiliano Curia <maxy at debian.org> Wed, 21 Mar 2018 14:41:33 +0100
-
-qqc2-desktop-style (5.43.0-1) experimental; urgency=medium
-
- * Use the salsa canonical urls
- * New upstream release (5.43.0).
- * Update build-deps and deps with the info from cmake
- * Release to experimental
-
- -- Maximiliano Curia <maxy at debian.org> Mon, 26 Feb 2018 11:44:24 +0100
-
-qqc2-desktop-style (5.42.0-2) sid; urgency=medium
-
- * New revision
- * Release to sid
-
- -- Maximiliano Curia <maxy at debian.org> Sat, 10 Feb 2018 11:29:25 +0100
-
-qqc2-desktop-style (5.42.0-1) experimental; urgency=medium
-
- * New upstream release (5.42.0).
- * Add link options as-needed
- * Bump debhelper build-dep and compat to 11.
- * Build without build_stamp
- * Update build-deps and deps with the info from cmake
- * Bump Standards-Version to 4.1.3.
- * Release to experimental
-
- -- Maximiliano Curia <maxy at debian.org> Fri, 02 Feb 2018 12:06:17 +0100
-
-qqc2-desktop-style (5.41.0-1) experimental; urgency=medium
-
- * Update Vcs fields
- * Update watch file
- * Update copyright file
- * Bump Standards-Version to 4.1.2.
- * Update build-deps and deps with the info from cmake
- * Update build-deps and deps with the info from cmake
- * Release to experimental
-
- -- Maximiliano Curia <maxy at debian.org> Fri, 15 Dec 2017 10:43:25 -0300
-
-qqc2-desktop-style (5.41.0-0neon) xenial; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Fri, 08 Dec 2017 14:49:10 +0000
-
-qqc2-desktop-style (5.40.0-0neon) xenial; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Fri, 10 Nov 2017 13:01:06 +0000
-
-qqc2-desktop-style (5.39.0-0neon) xenial; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Tue, 25 Apr 2017 15:42:30 +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 b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index baa9026..e9be939 100644
--- a/debian/control
+++ b/debian/control
@@ -1,52 +1,53 @@
-Source: qqc2-desktop-style
+Source: kf6-qqc2-desktop-style
Section: kde
Priority: optional
-Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 3.0~),
+Maintainer: Jonathan Esk-Riddell <jr at jriddell.org>
+Build-Depends: cmake,
dbus-x11,
- debhelper (>= 11~),
- extra-cmake-modules (>= 5.51.0~),
- kirigami2-dev (>= 5.51.0~),
- libkf5iconthemes-dev (>= 5.51.0~),
- libqt5x11extras5-dev (>= 5.8.0~),
+ debhelper-compat (= 13),
+ kf6-extra-cmake-modules,
+ kf6-kirigami2-dev,
+ kf6-iconthemes-dev,
pkg-config,
- pkg-kde-tools (>= 0.15.18~),
- qtbase5-dev (>= 5.8.0~),
- qtdeclarative5-dev (>= 5.8.0~),
- qtquickcontrols2-5-dev (>= 5.8.0~)
+ pkg-kde-tools-neon,
+ qt6-base-dev,
+ qt6-declarative-dev,
Standards-Version: 4.1.4
Homepage: https://cgit.kde.org/qqc2-desktop-style.git/
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/qqc2-desktop-style
Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/qqc2-desktop-style.git
-Package: libkf5qqc2desktopstyle-dev
-Section: libdevel
+Package: kf6-qqc2-desktop-style
Architecture: any
-Depends: qml-module-org-kde-qqc2desktopstyle (= ${binary:Version}),
- ${misc:Depends},
+Section: kde
+X-Neon-MergedPackage: true
+Depends: ${misc:Depends},
${shlibs:Depends}
-Breaks: qml-module-org-kde-qqc2desktopstyle (<< 5.40.0)
-Replaces: qml-module-org-kde-qqc2desktopstyle (<< 5.40.0)
Description: Qt Quick Controls 2: Desktop Style
Small style written in QML for QtQuickControls2 intended to be used
by default in QQC2-based apps when used in the Plasma desktop
- .
- This package contains the development files.
-Package: qml-module-org-kde-qqc2desktopstyle
+Package: kf6-qqc2-desktop-style-dev
Architecture: any
-Depends: qml-module-org-kde-kirigami2 (>= 5.51),
- qml-module-org-kde-sonnet,
- qml-module-qtgraphicaleffects,
- qml-module-qtqml-models2,
- qml-module-qtquick-controls2,
- qml-module-qtquick-layouts,
- qml-module-qtquick-templates2,
- qml-module-qtquick-window2,
- qml-module-qtquick2,
+Section: kde
+X-Neon-MergedPackage: true
+Depends: kf6-qqc2-desktop-style (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: Qt Quick Controls 2: Desktop Style
Small style written in QML for QtQuickControls2 intended to be used
by default in QQC2-based apps when used in the Plasma desktop
+ .
+ This package contains the development files.
+
+Package: qml-module-org-kde-qqc2desktopstyle
+Architecture: all
+Depends: kf6-qqc2-desktop-style
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf6qqc2desktopstyle-dev
+Architecture: all
+Depends: kf6-qqc2-desktop-style-dev
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/kf6-qqc2-desktop-style-dev.install b/debian/kf6-qqc2-desktop-style-dev.install
new file mode 100644
index 0000000..f2886d7
--- /dev/null
+++ b/debian/kf6-qqc2-desktop-style-dev.install
@@ -0,0 +1 @@
+usr/kf6/lib/*/cmake/KF5QQC2DesktopStyle/
diff --git a/debian/kf6-qqc2-desktop-style.install b/debian/kf6-qqc2-desktop-style.install
new file mode 100644
index 0000000..1f96492
--- /dev/null
+++ b/debian/kf6-qqc2-desktop-style.install
@@ -0,0 +1,2 @@
+usr/kf6/lib/*/plugins/
+usr/kf6/lib/*/qml/
diff --git a/debian/libkf5qqc2desktopstyle-dev.install b/debian/libkf5qqc2desktopstyle-dev.install
deleted file mode 100644
index b899330..0000000
--- a/debian/libkf5qqc2desktopstyle-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/cmake/KF5QQC2DeskopStyle/*
-usr/lib/*/cmake/KF5QQC2DesktopStyle/KF5QQC2DesktopStyleConfig.cmake
-usr/lib/*/cmake/KF5QQC2DesktopStyle/KF5QQC2DesktopStyleConfigVersion.cmake
diff --git a/debian/qml-module-org-kde-qqc2desktopstyle.install b/debian/qml-module-org-kde-qqc2desktopstyle.install
deleted file mode 100644
index 1c4c920..0000000
--- a/debian/qml-module-org-kde-qqc2desktopstyle.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/qt5/plugins/kf5/kirigami/org.kde.desktop.so
-usr/lib/*/qt5/qml/QtQuick/Controls.2/*
-usr/lib/*/qt5/qml/org/kde/qqc2desktopstyle/*
diff --git a/debian/rules b/debian/rules
index 0c98761..fa0af1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,8 @@
#!/usr/bin/make -f
# -*- makefile -*-
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
-
%:
- dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
+ dh $@ --with kf6 --buildsystem kf6
+
+override_dh_shlibdeps:
+ dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
More information about the Neon-commits
mailing list