[neon/extras/kuserfeedback/Neon/release] debian: new release

[Jonathan Esk-Riddell]

Git commit 2fe78d464a6cea0acfa54cd3b702c05a00c3cc3c by Jonathan Esk-Riddell.
Committed on 04/02/2022 at 15:50.
Pushed by jriddell into branch 'Neon/release'.

new release

M  +1    -1    debian/changelog
M  +2    -1    debian/kuserfeedback-bin.install
M  +1    -1    debian/libkuserfeedbackcore1.install
D  +0    -33   debian/patches/opengl-source.diff
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/extras/kuserfeedback/commit/2fe78d464a6cea0acfa54cd3b702c05a00c3cc3c

diff --git a/debian/changelog b/debian/changelog
index 868b104..6cf2f8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kuserfeedback (1.0.0-0) bionic; urgency=medium
+kuserfeedback (1.2.0-0) bionic; urgency=medium
 
   * New release
 
diff --git a/debian/kuserfeedback-bin.install b/debian/kuserfeedback-bin.install
index ff8c10a..c7d469c 100644
--- a/debian/kuserfeedback-bin.install
+++ b/debian/kuserfeedback-bin.install
@@ -1,4 +1,5 @@
 usr/bin/UserFeedbackConsole
 usr/bin/userfeedbackctl
-usr/share/applications/UserFeedbackConsole.desktop
+usr/share/applications/org.kde.kuserfeedback-console.desktop
 usr/share/locale/*/LC_MESSAGES/userfeedbackconsole5_qt.qm
+usr/share/metainfo/org.kde.kuserfeedback-console.appdata.xml
diff --git a/debian/libkuserfeedbackcore1.install b/debian/libkuserfeedbackcore1.install
index e404ca2..9302471 100644
--- a/debian/libkuserfeedbackcore1.install
+++ b/debian/libkuserfeedbackcore1.install
@@ -1,3 +1,3 @@
-etc/xdg/org_kde_UserFeedback.categories
 usr/lib/*/libKUserFeedbackCore.so.1*
 usr/share/locale/*/LC_MESSAGES/userfeedbackprovider5_qt.qm
+usr/share/qlogging-categories5/org_kde_UserFeedback.categories
diff --git a/debian/patches/opengl-source.diff b/debian/patches/opengl-source.diff
deleted file mode 100644
index 1ba35ca..0000000
--- a/debian/patches/opengl-source.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 17db7d75643b4f3dccd5b36a6ab175f03ba74297
-Author: Aleix Pol <aleixpol at kde.org>
-Date:   Wed Feb 2 20:36:40 2022 +0100
-
-    opengl source: Do not crash if we could not make our context current
-    
-    BUG: 449505
-
-diff --git a/src/provider/core/openglinfosource.cpp b/src/provider/core/openglinfosource.cpp
-index 5117d85..08402c7 100644
---- a/src/provider/core/openglinfosource.cpp
-+++ b/src/provider/core/openglinfosource.cpp
-@@ -13,6 +13,7 @@
- #include <QOpenGLFunctions>
- #include <QSurfaceFormat>
- #include <QWindow>
-+#include "logging_p.h"
- #endif
- 
- using namespace KUserFeedback;
-@@ -37,7 +38,11 @@ QVariant OpenGLInfoSource::data()
-         QWindow window;
-         window.setSurfaceType(QSurface::OpenGLSurface);
-         window.create();
--        context.makeCurrent(&window);
-+        if (!context.makeCurrent(&window)) {
-+            qCWarning(Log) << "Could not make OpenGL context current";
-+            m.insert(QStringLiteral("type"), QStringLiteral("none"));
-+            return m;
-+        }
-         QOpenGLFunctions functions(&context);
-         m.insert(QStringLiteral("vendor"), OpenGLInfoSourcePrivate::normalizeVendor(reinterpret_cast<const char*>(functions.glGetString(GL_VENDOR))));
-         m.insert(QStringLiteral("renderer"), OpenGLInfoSourcePrivate::normalizeRenderer(reinterpret_cast<const char*>(functions.glGetString(GL_RENDERER))));
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index cba1de2..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-opengl-source.diff