[neon/kde/breeze-gtk/Neon/unstable] debian: port to kf6

Carlos De Maine null at kde.org
Tue Mar 14 01:15:13 GMT 2023


Git commit 5523f20e71c3f519e0a773b6c2bb47f7ed774f97 by Carlos De Maine.
Committed on 14/03/2023 at 00:59.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6

M  +1    -1    debian/breeze-gtk-theme.install
M  +12   -12   debian/control
M  +5    -10   debian/rules
M  +8    -2    debian/tests/control

https://invent.kde.org/neon/kde/breeze-gtk/commit/5523f20e71c3f519e0a773b6c2bb47f7ed774f97

diff --git a/debian/breeze-gtk-theme.install b/debian/breeze-gtk-theme.install
index 1b91047..72a5a8b 100644
--- a/debian/breeze-gtk-theme.install
+++ b/debian/breeze-gtk-theme.install
@@ -1 +1 @@
-usr/
+usr/kf6/
diff --git a/debian/control b/debian/control
index 5b68dd9..da8de63 100644
--- a/debian/control
+++ b/debian/control
@@ -6,22 +6,22 @@ Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: breeze-dev,
                cmake (>= 3.2),
                debhelper (>= 11~),
-               extra-cmake-modules (>= 5.18.0~),
                gtk2-engines-pixbuf,
                kde-style-breeze,
+               kf6-extra-cmake-modules,
+               kf6-karchive-dev,
+               kf6-kcmutils-dev,
+               kf6-kconfigwidgets-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kio-dev,
+               kf6-knewstuff-dev,
                libglib2.0-dev,
                libgtk-3-dev,
                libgtk2.0-dev,
-               libkf5archive-dev (>= 5.18.0~),
-               libkf5configwidgets-dev (>= 5.18.0~),
-               libkf5i18n-dev (>= 5.18.0~),
-               libkf5iconthemes-dev (>= 5.18.0~),
-               libkf5kcmutils-dev (>= 5.18.0~),
-               libkf5kio-dev (>= 5.18.0~),
-               libkf5newstuff-dev (>= 5.18.0~),
-               pkg-kde-tools (>= 0.15.16),
+               pkg-kde-tools-neon,
                python3-cairo,
-               qtbase5-dev,
+               qt6-base-dev,
                sassc,
                xvfb
 Homepage: https://projects.kde.org/projects/kde/workspace/breeze-gtk
@@ -32,8 +32,8 @@ Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/breeze-gtk
 Package: breeze-gtk-theme
 Architecture: any
 Depends: gtk2-engines-pixbuf, ${misc:Depends}, ${shlibs:Depends}
-Breaks: gtk3-engines-breeze  (<< 5.15.0)
-Replaces: gtk3-engines-breeze  (<< 5.15.0)
+Breaks: gtk3-engines-breeze (<< 5.15.0)
+Replaces: gtk3-engines-breeze (<< 5.15.0)
 Description: GTK theme built to match KDE's Breeze
  A GTK Theme Built to Match KDE's Breeze. Widget theme for GTK 2 and 3.
 
diff --git a/debian/rules b/debian/rules
index 94aa875..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,9 @@
 #!/usr/bin/make -f
-
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
-
-
-override_dh_auto_configure:
-	dh_auto_configure -- -DWITH_GTK3_VERSION=3.20
+	dh $@ --with kf6 --buildsystem kf6
 
-override_dh_auto_test:
-	# Disable dh_auto_test at build time
-	:
+override_dh_shlibdeps:
+	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
diff --git a/debian/tests/control b/debian/tests/control
index 1a6840a..55979e2 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,10 @@
 Tests: testsuite
-Depends: @, build-essential, debhelper, cmake,
-         xvfb, xauth, dbus (>= 1.8), libqt5test5
+Depends: build-essential,
+         cmake,
+         dbus (>= 1.8),
+         debhelper,
+         libqt5test5,
+         xauth,
+         xvfb,
+         @
 Restrictions: build-needed


More information about the Neon-commits mailing list