[neon/extras/kuserfeedback/Neon/unstable] debian: Revert "More kf6ification"

Scarlett Moore null at kde.org
Fri Dec 1 17:01:01 GMT 2023


Git commit c49a2c8798bb8399de0ebf183e0b724611812382 by Scarlett Moore.
Committed on 01/12/2023 at 18:00.
Pushed by scarlettmoore into branch 'Neon/unstable'.

Revert "More kf6ification"

This reverts commit ff7fd0c4a795556eaed21ca9436d8cd07cbdec7a.

M  +69   -32   debian/control
D  +0    -18   debian/kf6-kuserfeedback.install
A  +5    -0    debian/kuserfeedback-bin.install
R  +0    -0    debian/kuserfeedback-dev.install [from: debian/kf6-kuserfeedback-dev.install - 100% similarity]
A  +1    -0    debian/kuserfeedback-doc.install
A  +3    -0    debian/libkuserfeedbackcore1.install
A  +1    -0    debian/libkuserfeedbackcore1.maintscript
A  +1    -0    debian/libkuserfeedbackwidgets1.install
A  +2    -0    debian/qml6-module-org-kde-userfeedback.install

https://invent.kde.org/neon/extras/kuserfeedback/-/commit/c49a2c8798bb8399de0ebf183e0b724611812382

diff --git a/debian/control b/debian/control
index d2e4ece..2e01ae8 100644
--- a/debian/control
+++ b/debian/control
@@ -24,18 +24,10 @@ 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: libkf6userfeedback-bin
-Architecture: all
-Depends: kf6-kuserfeedback
-Description: Dummy transitional
- Transitional dummy package.
-
-Package: kf6-kuserfeedback
-Section: libdevel
+Package: kuserfeedback-bin
 Architecture: any
-X-Neon-MergedPackage: true
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: KUserFeedback library
+Description: user feedback for applications - executables
  Framework for collecting user feedback for applications via telemetry
  and surveys.
  .
@@ -47,13 +39,13 @@ Description: KUserFeedback library
   * Survey targeting based on telemetry data.
   * Allow the user to configure how often they want to participate in surveys.
  .
- This package contains the library for kuserfeedback.
+ This package contains the management and analytics applications.
 
-Package: kf6-kuserfeedback-dev
+Package: kuserfeedback-dev
 Section: libdevel
 Architecture: any
-X-Neon-MergedPackage: true
-Depends: kf6-kuserfeedback (= ${binary:Version}),
+Depends: libkuserfeedbackcore1 (= ${binary:Version}),
+         libkuserfeedbackwidgets1 (= ${binary:Version}),
          qt6-base-dev,
          ${misc:Depends},
 Description: development files for KUserFeedback
@@ -70,29 +62,74 @@ Description: development files for KUserFeedback
  .
  This package contains the development header files for kuserfeedback.
 
-Package: libkf6userfeedback-doc
+Package: kuserfeedback-doc
 Architecture: all
-Depends: kf6-kuserfeedback
-Description: Dummy transitional
- Transitional dummy package.
+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 kuserfeedback.
 
-Package: libkf6userfeedbackcore6
-Architecture: all
-Depends: kf6-kuserfeedback
-Description: Dummy transitional
- Transitional dummy package.
+Package: libkuserfeedbackcore1
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: kuserfeedback-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 kuserfeedback.
 
-Package: libkf6userfeedbackwidgets6
-Architecture: all
-Depends: kf6-kuserfeedback
-Description: Dummy transitional
- Transitional dummy package.
+Package: libkuserfeedbackwidgets1
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: qml-module-org-kde-userfeedback (= ${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 kuserfeedback.
 
 Package: qml6-module-org-kde-userfeedback
-Architecture: all
-Depends: kf6-kuserfeedback
-Description: Dummy transitional
- Transitional dummy package.
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+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.
diff --git a/debian/kf6-kuserfeedback.install b/debian/kf6-kuserfeedback.install
deleted file mode 100644
index 20816f9..0000000
--- a/debian/kf6-kuserfeedback.install
+++ /dev/null
@@ -1,18 +0,0 @@
-usr/bin/UserFeedbackConsole
-usr/bin/userfeedbackctl
-usr/share/applications/org.kde.kuserfeedback-console.desktop
-usr/share/locale/*/LC_MESSAGES/userfeedbackconsole6_qt.qm
-usr/share/metainfo/org.kde.kuserfeedback-console.appdata.xml
-usr/share/KDE/UserFeedbackConsole
-usr/lib/*/qt6/qml/org/kde/userfeedback/libKUserFeedbackQml.so
-usr/lib/*/qt6/qml/org/kde/userfeedback/qmldir
-usr/lib/*/libKF6UserFeedbackWidgets.so.*
-usr/share/KDE/UserFeedbackConsoleusr/share/KDE/UserFeedbackConsoleusr/share/KDE/UserFeedbackConsoleusr/shusr/share/KDE/UserFeedbackConsoleare/KDE/UserFeedbackConsoleusr/share/KDE/UserFeedbackConsoleusr/share/KDE/UserFeedbackConsoleusr/share/KDE/UserFeusr/share/KDE/UserFeedbackConsoleedbackConsole
-usr/share/locale/*/LC_MESSAGES/userfeedbackprovider6_qt.qm
-usr/share/qlogging-categories5/org_kde_UserFeedback.categories
-usr/lib/*/libKF6UserFeedbackCore.so.*
-usr/bin/UserFeedbackConsole
-usr/bin/userfeedbackctl
-usr/share/applications/org.kde.kuserfeedback-console.desktop
-usr/share/locale/*/LC_MESSAGES/userfeedbackconsole6_qt.qm
-usr/share/metainfo/org.kde.kuserfeedback-console.appdata.xml
diff --git a/debian/kuserfeedback-bin.install b/debian/kuserfeedback-bin.install
new file mode 100644
index 0000000..111d602
--- /dev/null
+++ b/debian/kuserfeedback-bin.install
@@ -0,0 +1,5 @@
+usr/bin/UserFeedbackConsole
+usr/bin/userfeedbackctl
+usr/share/applications/org.kde.kuserfeedback-console.desktop
+usr/share/locale/*/LC_MESSAGES/userfeedbackconsole6_qt.qm
+usr/share/metainfo/org.kde.kuserfeedback-console.appdata.xml
diff --git a/debian/kf6-kuserfeedback-dev.install b/debian/kuserfeedback-dev.install
similarity index 100%
rename from debian/kf6-kuserfeedback-dev.install
rename to debian/kuserfeedback-dev.install
diff --git a/debian/kuserfeedback-doc.install b/debian/kuserfeedback-doc.install
new file mode 100644
index 0000000..9258e69
--- /dev/null
+++ b/debian/kuserfeedback-doc.install
@@ -0,0 +1 @@
+usr/share/KDE/UserFeedbackConsole
diff --git a/debian/libkuserfeedbackcore1.install b/debian/libkuserfeedbackcore1.install
new file mode 100644
index 0000000..ef66548
--- /dev/null
+++ b/debian/libkuserfeedbackcore1.install
@@ -0,0 +1,3 @@
+usr/lib/*/libKUserFeedbackCore.so.1*
+usr/share/locale/*/LC_MESSAGES/userfeedbackprovider6_qt.qm
+usr/share/qlogging-categories5/org_kde_UserFeedback.categories
diff --git a/debian/libkuserfeedbackcore1.maintscript b/debian/libkuserfeedbackcore1.maintscript
new file mode 100644
index 0000000..1602b5c
--- /dev/null
+++ b/debian/libkuserfeedbackcore1.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/xdg/org_kde_UserFeedback.categories 1.2.0-2~
diff --git a/debian/libkuserfeedbackwidgets1.install b/debian/libkuserfeedbackwidgets1.install
new file mode 100644
index 0000000..f04da85
--- /dev/null
+++ b/debian/libkuserfeedbackwidgets1.install
@@ -0,0 +1 @@
+usr/lib/*/libKUserFeedbackWidgets.so.1*
diff --git a/debian/qml6-module-org-kde-userfeedback.install b/debian/qml6-module-org-kde-userfeedback.install
new file mode 100644
index 0000000..fdd9d19
--- /dev/null
+++ b/debian/qml6-module-org-kde-userfeedback.install
@@ -0,0 +1,2 @@
+usr/lib/*/qt6/qml/org/kde/userfeedback/libKUserFeedbackQml.so
+usr/lib/*/qt6/qml/org/kde/userfeedback/qmldir



More information about the Neon-commits mailing list