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

Scarlett Moore null at kde.org
Fri Dec 1 15:06:48 GMT 2023 

Git commit ff7fd0c4a795556eaed21ca9436d8cd07cbdec7a by Scarlett Moore.
Committed on 01/12/2023 at 16:06.
Pushed by scarlettmoore into branch 'Neon/unstable'.

More kf6ification

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

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

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