[neon/kf6/kf6-kxmlgui/Neon/unstable] debian: fix up mkspec path

Harald Sitter null at kde.org
Tue Mar 14 09:36:22 GMT 2023


Git commit 7d9f6dda19b9333fe68f90de5011fed2b8e141d4 by Harald Sitter.
Committed on 14/03/2023 at 09:29.
Pushed by sitter into branch 'Neon/unstable'.

fix up mkspec path

M  +16   -14   debian/control
M  +1    -1    debian/kf6-kxmlgui-dev.install
M  +1    -1    debian/kf6-kxmlgui.install

https://invent.kde.org/neon/kf6/kf6-kxmlgui/commit/7d9f6dda19b9333fe68f90de5011fed2b8e141d4

diff --git a/debian/control b/debian/control
index 44a5edf..6dbf9ff 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Build-Depends: cmake,
                debhelper-compat (= 13),
                doxygen,
                graphviz,
-               kf6-extra-cmake-modules,
                kf6-attica-dev,
+               kf6-extra-cmake-modules,
                kf6-kconfig-dev,
                kf6-kconfigwidgets-dev,
                kf6-kcoreaddons-dev,
@@ -42,19 +42,21 @@ Package: kf6-kxmlgui-dev
 Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
-Depends: kf6-kxmlgui (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends},
-               kf6-attica-dev,
-               kf6-kconfig-dev,
-               kf6-kconfigwidgets-dev,
-               kf6-kcoreaddons-dev,
-               kf6-kglobalaccel-dev,
-               kf6-ki18n-dev,
-               kf6-kiconthemes-dev,
-               kf6-kitemviews-dev,
-               kf6-ktextwidgets-dev,
-               kf6-kwidgetsaddons-dev,
-               kf6-kwindowsystem-dev,
-               pkg-kde-tools-neon,
+Depends: kf6-attica-dev,
+         kf6-kconfig-dev,
+         kf6-kconfigwidgets-dev,
+         kf6-kcoreaddons-dev,
+         kf6-kglobalaccel-dev,
+         kf6-ki18n-dev,
+         kf6-kiconthemes-dev,
+         kf6-kitemviews-dev,
+         kf6-ktextwidgets-dev,
+         kf6-kwidgetsaddons-dev,
+         kf6-kwindowsystem-dev,
+         kf6-kxmlgui (= ${binary:Version}),
+         pkg-kde-tools-neon,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: User configurable main windows.
  framework for designing the user interface
  of an application using XML, using the idea
diff --git a/debian/kf6-kxmlgui-dev.install b/debian/kf6-kxmlgui-dev.install
index 09ec0ec..edd60b8 100644
--- a/debian/kf6-kxmlgui-dev.install
+++ b/debian/kf6-kxmlgui-dev.install
@@ -2,4 +2,4 @@ usr/kf6/include/KF6/KXmlGui/
 usr/kf6/lib/*/cmake/KF6XmlGui/*
 usr/kf6/lib/*/libKF6XmlGui.so
 usr/kf6/lib/*/plugins/designer/
-usr/kf6/mkspecs/modules/qt_KXmlGui.pri
+usr/kf6/lib/*/qt6/mkspecs/modules/qt_KXmlGui.pri
diff --git a/debian/kf6-kxmlgui.install b/debian/kf6-kxmlgui.install
index b3afdde..a13b852 100644
--- a/debian/kf6-kxmlgui.install
+++ b/debian/kf6-kxmlgui.install
@@ -1,6 +1,6 @@
 usr/kf6/etc/xdg/ui/ui_standards.rc
-usr/kf6/lib/*/libKF6XmlGui.so.6
 usr/kf6/lib/*/libKF6XmlGui.so.5.*
+usr/kf6/lib/*/libKF6XmlGui.so.6
 usr/kf6/lib/*/libexec/kf6/ksendbugmail
 usr/kf6/share/locale/
 usr/kf6/share/qlogging-categories6/


More information about the Neon-commits mailing list