[neon/forks/kuserfeedback6/Neon/unstable] debian: move to /usr and post to kf6 package style ready for moving
Carlos De Maine
null at kde.org
Sat May 13 00:18:22 BST 2023
Git commit 94c47fd56bda3904d066cea864c86e4ad7c4d9f2 by Carlos De Maine.
Committed on 12/05/2023 at 23:18.
Pushed by carlosdem into branch 'Neon/unstable'.
move to /usr and post to kf6 package style ready for moving
M +41 -76 debian/control
A +6 -0 debian/kf6-kuserfeedback-dev.install
A +11 -0 debian/kf6-kuserfeedback.install
D +0 -5 debian/kuserfeedback6-bin.install
D +0 -6 debian/kuserfeedback6-dev.install
D +0 -1 debian/kuserfeedback6-doc.install
D +0 -3 debian/libkuserfeedback6core1.install
D +0 -1 debian/libkuserfeedback6core1.substvars
D +0 -1 debian/libkuserfeedback6widgets1.install
D +0 -2 debian/qml-module-org-kde-userfeedback6.install
D +0 -9 debian/salsa-ci.yml
https://invent.kde.org/neon/forks/kuserfeedback6/commit/94c47fd56bda3904d066cea864c86e4ad7c4d9f2
diff --git a/debian/control b/debian/control
index 732b1d7..310c3cd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
Source: kuserfeedback6
-Section: libs
+Section: kde
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Aurélien COUDERC <coucouf at debian.org>,
@@ -25,9 +25,11 @@ Homepage: https://invent.kde.org/libraries/kuserfeedback
Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/kuserfeedback
Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/kuserfeedback.git
-Package: kuserfeedback6-bin
+Package: kf6-kuserfeedback
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Section: kde
+X-Neon-MergedPackage: true
+Depends: ${misc:Depends}
Description: user feedback for applications - executables
Framework for collecting user feedback for applications via telemetry
and surveys.
@@ -42,12 +44,17 @@ Description: user feedback for applications - executables
.
This package contains the management and analytics applications.
-Package: kuserfeedback6-dev
-Section: libdevel
+Package: kf6-kuserfeedback6-dev
Architecture: any
-Depends: libkuserfeedback6core1 (= ${binary:Version}),
- libkuserfeedback6widgets1 (= ${binary:Version}),
+Section: kde
+X-Neon-MergedPackage: true
+Depends: kf6-kuserfeedback (= ${binary:Version}),
+ qt6-charts-dev,
+ qt6-svg-dev,
qt6-base-dev,
+ qt6-declarative-dev,
+ qt6-tools-dev,
+ qt6-tools-dev-tools,
${misc:Depends},
Description: development files for KUserFeedback
Framework for collecting user feedback for applications via telemetry
@@ -63,80 +70,38 @@ Description: development files for KUserFeedback
.
This package contains the development header files for kuserfeedback6.
+Package: kuserfeedback6-bin
+Architecture: all
+Depends: kf6-kuserfeedback
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: kuserfeedback6-dev
+Architecture: all
+Depends: kf6-kuserfeedback
+Description: Dummy transitional
+ Transitional dummy package.
+
Package: kuserfeedback6-doc
Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends}
-Section: doc
-Description: user feedback for applications - documentation
- Framework for collecting user feedback for applications via telemetry
- and surveys.
- .
- Telemetry
- * Extensible set of data sources for telemetry.
- * Full control for the user on what data to contribute.
- Surveys
- * Distribute surveys and offer users to participate in them.
- * Survey targeting based on telemetry data.
- * Allow the user to configure how often they want to participate in surveys.
- .
- This package contains the documentation for kuserfeedback6.
+Depends: kf6-kuserfeedback
+Description: Dummy transitional
+ Transitional dummy package.
Package: libkuserfeedback6core1
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: kuserfeedback6-doc (= ${binary:Version})
-Description: user feedback for applications - core library
- Framework for collecting user feedback for applications via telemetry
- and surveys.
- .
- Telemetry
- * Extensible set of data sources for telemetry.
- * Full control for the user on what data to contribute.
- Surveys
- * Distribute surveys and offer users to participate in them.
- * Survey targeting based on telemetry data.
- * Allow the user to configure how often they want to participate in surveys.
- .
- This package contains the core library for kuserfeedback6.
+Architecture: all
+Depends: kf6-kuserfeedback
+Description: Dummy transitional
+ Transitional dummy package.
Package: libkuserfeedback6widgets1
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: qml-module-org-kde-userfeedback6 (= ${binary:Version})
-Description: user feedback for applications - widgets library
- Framework for collecting user feedback for applications via telemetry
- and surveys.
- .
- Telemetry
- * Extensible set of data sources for telemetry.
- * Full control for the user on what data to contribute.
- Surveys
- * Distribute surveys and offer users to participate in them.
- * Survey targeting based on telemetry data.
- * Allow the user to configure how often they want to participate in surveys.
- .
- This package contains the widgets library used by kuserfeedback6.
+Architecture: all
+Depends: kf6-kuserfeedback
+Description: Dummy transitional
+ Transitional dummy package.
Package: qml6-module-org-kde-userfeedback
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: qml-module-org-kde-userfeedback6
-Conflicts: qml-module-org-kde-userfeedback6
-Replaces: qml-module-org-kde-userfeedback6
-Description: user feedback for applications - QML module
- Framework for collecting user feedback for applications via telemetry
- and surveys.
- .
- Telemetry
- * Extensible set of data sources for telemetry.
- * Full control for the user on what data to contribute.
- Surveys
- * Distribute surveys and offer users to participate in them.
- * Survey targeting based on telemetry data.
- * Allow the user to configure how often they want to participate in surveys.
- .
- This package contains the QML module for kuserfeedback6.
+Architecture: all
+Depends: kf6-kuserfeedback
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/kf6-kuserfeedback-dev.install b/debian/kf6-kuserfeedback-dev.install
new file mode 100644
index 0000000..ae8bda8
--- /dev/null
+++ b/debian/kf6-kuserfeedback-dev.install
@@ -0,0 +1,6 @@
+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/kf6-kuserfeedback.install b/debian/kf6-kuserfeedback.install
new file mode 100644
index 0000000..51b46d6
--- /dev/null
+++ b/debian/kf6-kuserfeedback.install
@@ -0,0 +1,11 @@
+usr/bin/UserFeedbackConsole
+usr/bin/userfeedbackctl
+usr/lib/*/libKUserFeedbackCoreQt6.so.1*
+usr/lib/*/libKUserFeedbackWidgetsQt6.so.1*
+usr/lib/*/qt6/qml/org/kde/userfeedback/libKUserFeedbackQmlQt6.so
+usr/lib/*/qt6/qml/org/kde/userfeedback/qmldir
+usr/share/applications/org.kde.kuserfeedback-console.desktop
+usr/share/KDE/UserFeedbackConsole
+usr/share/locale/*/LC_MESSAGES/
+usr/share/qlogging-categories6/org_kde_UserFeedback.categories
+usr/share/metainfo/org.kde.kuserfeedback-console.appdata.xml
diff --git a/debian/kuserfeedback6-bin.install b/debian/kuserfeedback6-bin.install
deleted file mode 100644
index 4934729..0000000
--- a/debian/kuserfeedback6-bin.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/kf6/bin/UserFeedbackConsole
-usr/kf6/bin/userfeedbackctl
-usr/kf6/share/applications/org.kde.kuserfeedback-console.desktop
-usr/kf6/share/locale/*/LC_MESSAGES/
-usr/kf6/share/metainfo/org.kde.kuserfeedback-console.appdata.xml
diff --git a/debian/kuserfeedback6-dev.install b/debian/kuserfeedback6-dev.install
deleted file mode 100644
index 34bf024..0000000
--- a/debian/kuserfeedback6-dev.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/kf6/include/KUserFeedbackQt6/
-usr/kf6/lib/*/cmake/KUserFeedbackQt6/
-usr/kf6/lib/*/libKUserFeedbackCoreQt6.so
-usr/kf6/lib/*/libKUserFeedbackWidgetsQt6.so
-usr/kf6/lib/*/qt6/mkspecs/modules/qt_KUserFeedbackCoreQt6.pri
-usr/kf6/lib/*/qt6/mkspecs/modules/qt_KUserFeedbackWidgetsQt6.pri
diff --git a/debian/kuserfeedback6-doc.install b/debian/kuserfeedback6-doc.install
deleted file mode 100644
index 47ddea0..0000000
--- a/debian/kuserfeedback6-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/kf6/share/KDE/UserFeedbackConsole
diff --git a/debian/libkuserfeedback6core1.install b/debian/libkuserfeedback6core1.install
deleted file mode 100644
index a22674d..0000000
--- a/debian/libkuserfeedback6core1.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/kf6/lib/*/libKUserFeedbackCoreQt6.so.1*
-usr/kf6/share/locale/*/LC_MESSAGES/userfeedbackprovider5_qt.qm
-usr/kf6/share/qlogging-categories6/org_kde_UserFeedback.categories
diff --git a/debian/libkuserfeedback6core1.substvars b/debian/libkuserfeedback6core1.substvars
deleted file mode 100644
index 9df12ab..0000000
--- a/debian/libkuserfeedback6core1.substvars
+++ /dev/null
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.14), libstdc++6 (>= 5), qt6-base (>= 6.4.2+dfsg)
diff --git a/debian/libkuserfeedback6widgets1.install b/debian/libkuserfeedback6widgets1.install
deleted file mode 100644
index ca4cd12..0000000
--- a/debian/libkuserfeedback6widgets1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/kf6/lib/*/libKUserFeedbackWidgetsQt6.so.1*
diff --git a/debian/qml-module-org-kde-userfeedback6.install b/debian/qml-module-org-kde-userfeedback6.install
deleted file mode 100644
index 9772cc9..0000000
--- a/debian/qml-module-org-kde-userfeedback6.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/kf6/lib/*/qt6/qml/org/kde/userfeedback/libKUserFeedbackQmlQt6.so
-usr/kf6/lib/*/qt6/qml/org/kde/userfeedback/qmldir
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
deleted file mode 100644
index a47040c..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