[neon/extras/kuserfeedback/Neon/unstable] debian: rememeber to add the build override

Carlos De Maine null at kde.org
Tue Mar 14 11:52:26 GMT 2023


Git commit cec4a1e3bb19186e3ef9f530f9ca6a4d718f233d by Carlos De Maine.
Committed on 14/03/2023 at 11:52.
Pushed by carlosdem into branch 'Neon/unstable'.

rememeber to add the build override

M  +2    -1    debian/control
M  +5    -5    debian/kuserfeedback6-bin.install
M  +6    -6    debian/kuserfeedback6-dev.install
M  +1    -1    debian/kuserfeedback6-doc.install
M  +2    -2    debian/libkuserfeedback6core1.install
M  +1    -1    debian/libkuserfeedback6widgets1.install
A  +2    -0    debian/qml-module-org-kde-userfeedback6.install
M  +4    -0    debian/rules

https://invent.kde.org/neon/extras/kuserfeedback/commit/cec4a1e3bb19186e3ef9f530f9ca6a4d718f233d

diff --git a/debian/control b/debian/control
index de5ef6a..a381371 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,8 @@ Build-Depends: bison,
                qt6-charts-dev,
                libqt5svg5-dev,
                qt6-svg-dev,
-               pkg-kde-tools (>= 0.15.15ubuntu1~),
+               pkg-kde-tools,
+               pkg-kde-tools-neon,
                qtbase5-dev (>= 5.8.0~),
                qt6-base-dev,
                qtdeclarative5-dev,
diff --git a/debian/kuserfeedback6-bin.install b/debian/kuserfeedback6-bin.install
index 451fec5..7f56cf1 100644
--- a/debian/kuserfeedback6-bin.install
+++ b/debian/kuserfeedback6-bin.install
@@ -1,5 +1,5 @@
-usr/bin/UserFeedbackConsole6
-usr/bin/userfeedbackctl6
-usr/share/applications/org.kde.kuserfeedback6-console.desktop
-usr/share/locale/*/LC_MESSAGES/userfeedbackconsole6_qt.qm
-usr/share/metainfo/org.kde.kuserfeedback6-console.appdata.xml
+usr/bin/UserFeedbackConsole
+usr/bin/userfeedbackctl
+usr/share/applications/org.kde.kuserfeedback-console.desktop
+usr/share/locale/*/LC_MESSAGES/userfeedbackconsole_qt.qm
+usr/share/metainfo/org.kde.kuserfeedback-console.appdata.xml
diff --git a/debian/kuserfeedback6-dev.install b/debian/kuserfeedback6-dev.install
index 846e3ed..ae8bda8 100644
--- a/debian/kuserfeedback6-dev.install
+++ b/debian/kuserfeedback6-dev.install
@@ -1,6 +1,6 @@
-usr/include/KUserFeedback/
-usr/lib/*/cmake/KUserFeedback/
-usr/lib/*/libKUserFeedbackCore.so
-usr/lib/*/libKUserFeedbackWidgets.so
-usr/lib/*/qt6/mkspecs/modules/qt_KUserFeedbackCore.pri
-usr/lib/*/qt6/mkspecs/modules/qt_KUserFeedbackWidgets.pri
+usr/include/KUserFeedbackQt6/
+usr/lib/*/cmake/KUserFeedbackQt6/
+usr/lib/*/libKUserFeedbackCoreQt6.so
+usr/lib/*/libKUserFeedbackWidgetsQt6.so
+usr/lib/*/qt6/mkspecs/modules/qt_KUserFeedbackCoreQt6.pri
+usr/lib/*/qt6/mkspecs/modules/qt_KUserFeedbackWidgetsQt6.pri
diff --git a/debian/kuserfeedback6-doc.install b/debian/kuserfeedback6-doc.install
index a49f0e6..5bb534f 100644
--- a/debian/kuserfeedback6-doc.install
+++ b/debian/kuserfeedback6-doc.install
@@ -1 +1 @@
-usr/share/KDE/UserFeedbackConsole6
+usr/share/KDE/UserFeedbackConsoleQt6
diff --git a/debian/libkuserfeedback6core1.install b/debian/libkuserfeedback6core1.install
index 5d4bbd4..a6318ac 100644
--- a/debian/libkuserfeedback6core1.install
+++ b/debian/libkuserfeedback6core1.install
@@ -1,3 +1,3 @@
-usr/lib/*/libKUserFeedbackCore6.so.1*
-usr/share/locale/*/LC_MESSAGES/userfeedbackprovider6_qt.qm
+usr/lib/*/libKUserFeedbackCoreQt6.so.1*
+usr/share/locale/*/LC_MESSAGES/userfeedbackprovider5_qt.qm
 usr/share/qlogging-categories6/org_kde_UserFeedback.categories
diff --git a/debian/libkuserfeedback6widgets1.install b/debian/libkuserfeedback6widgets1.install
index dcc401f..e6f3121 100644
--- a/debian/libkuserfeedback6widgets1.install
+++ b/debian/libkuserfeedback6widgets1.install
@@ -1 +1 @@
-usr/lib/*/libKUserFeedback6Widgets.so.1*
+usr/lib/*/libKUserFeedbackWidgetsQt6.so.1*
diff --git a/debian/qml-module-org-kde-userfeedback6.install b/debian/qml-module-org-kde-userfeedback6.install
new file mode 100644
index 0000000..fdd9d19
--- /dev/null
+++ b/debian/qml-module-org-kde-userfeedback6.install
@@ -0,0 +1,2 @@
+usr/lib/*/qt6/qml/org/kde/userfeedback/libKUserFeedbackQml.so
+usr/lib/*/qt6/qml/org/kde/userfeedback/qmldir
diff --git a/debian/rules b/debian/rules
index 6cddd6d..a6f323b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,10 @@ override_dh_auto_configure-indep:
 	dh_auto_configure -- -DENABLE_DOCS=ON
 	dh_auto_configure --builddirectory=build-Qt6 -- -DENABLE_DOCS=ON -DBUILD_WITH_QT6=ON
 
+override_dh_auto_build:
+	dh_auto_build
+	dh_auto_build --builddirectory=build-Qt6
+
 override_dh_auto_install:
 	dh_auto_install
 	dh_auto_install --builddirectory=build-Qt6


More information about the Neon-commits mailing list