Package: lomiri-thumbnailer
Version: 3.0.1-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu lunar ubuntu-patch
X-Debbugs-Cc: bdr...@debian.org
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Rename /etc/apport/blacklist.d to /etc/apport/report-ignore for
Apport >= 2.25.0
This patch might be useful for upstream, but the new path is not taken
into account by older apport versions. So upstream should not take the
patch if they want to support older Ubuntu versions.
Thanks for considering the patch.
--
Benjamin Drung
Debian & Ubuntu Developer
diff -Nru lomiri-thumbnailer-3.0.1/debian/lomiri-thumbnailer-service.install
lomiri-thumbnailer-3.0.1/debian/lomiri-thumbnailer-service.install
--- lomiri-thumbnailer-3.0.1/debian/lomiri-thumbnailer-service.install
2022-07-20 00:15:27.000000000 +0200
+++ lomiri-thumbnailer-3.0.1/debian/lomiri-thumbnailer-service.install
2023-02-17 11:27:32.000000000 +0100
@@ -1,4 +1,4 @@
-etc/apport/blacklist.d/lomiri-thumbnailer
+etc/apport/report-ignore/lomiri-thumbnailer
usr/bin/lomiri-thumbnailer-admin
usr/libexec/lomiri-thumbnailer/thumbnailer-service
usr/libexec/lomiri-thumbnailer/vs-thumb
diff -Nru
lomiri-thumbnailer-3.0.1/debian/lomiri-thumbnailer-service.maintscript
lomiri-thumbnailer-3.0.1/debian/lomiri-thumbnailer-service.maintscript
--- lomiri-thumbnailer-3.0.1/debian/lomiri-thumbnailer-service.maintscript
1970-01-01 01:00:00.000000000 +0100
+++ lomiri-thumbnailer-3.0.1/debian/lomiri-thumbnailer-service.maintscript
2023-02-17 11:35:52.000000000 +0100
@@ -0,0 +1 @@
+mv_conffile /etc/apport/blacklist.d/lomiri-thumbnailer
/etc/apport/report-ignore/lomiri-thumbnailer 3.0.1-1ubuntu1~
diff -Nru
lomiri-thumbnailer-3.0.1/debian/patches/1001_rename_apport_directory.patch
lomiri-thumbnailer-3.0.1/debian/patches/1001_rename_apport_directory.patch
--- lomiri-thumbnailer-3.0.1/debian/patches/1001_rename_apport_directory.patch
1970-01-01 01:00:00.000000000 +0100
+++ lomiri-thumbnailer-3.0.1/debian/patches/1001_rename_apport_directory.patch
2023-02-17 11:39:19.000000000 +0100
@@ -0,0 +1,43 @@
+From b4e6aec81bab0bd2d1689f45a80a85073c2d5c48 Mon Sep 17 00:00:00 2001
+From: Benjamin Drung <benjamin.dr...@canonical.com>
+Date: Fri, 17 Feb 2023 11:39:10 +0100
+Subject: Rename /etc/apport/blacklist.d to /etc/apport/report-ignore
+
+Apport 2.25.0 renamed `/etc/apport/blacklist.d` to `/etc/apport/report-ignore`.
+
+Signed-off-by: Benjamin Drung <benjamin.dr...@canonical.com>
+---
+ data/CMakeLists.txt | 8 ++++----
+ ....in => etc_apport_report-ignore_lomiri-thumbnailer.in} | 0
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+ rename data/{etc_apport_blacklist.d_lomiri-thumbnailer.in =>
etc_apport_report-ignore_lomiri-thumbnailer.in} (100%)
+
+diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
+index 6a6b4dc..2717ea7 100644
+--- a/data/CMakeLists.txt
++++ b/data/CMakeLists.txt
+@@ -5,13 +5,13 @@ execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0
--variable glib_compil
+ execute_process (COMMAND ${_glib_comple_schemas} ${CMAKE_CURRENT_SOURCE_DIR}
--targetdir=${CMAKE_CURRENT_BINARY_DIR} OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+ configure_file(
+- etc_apport_blacklist.d_lomiri-thumbnailer.in
+- etc_apport_blacklist.d_lomiri-thumbnailer
++ etc_apport_report-ignore_lomiri-thumbnailer.in
++ etc_apport_report-ignore_lomiri-thumbnailer
+ @ONLY
+ )
+
+ install(FILES
+- "${CMAKE_CURRENT_BINARY_DIR}/etc_apport_blacklist.d_lomiri-thumbnailer"
++ "${CMAKE_CURRENT_BINARY_DIR}/etc_apport_report-ignore_lomiri-thumbnailer"
+ RENAME lomiri-thumbnailer
+- DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/apport/blacklist.d"
++ DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/apport/report-ignore"
+ )
+diff --git a/data/etc_apport_blacklist.d_lomiri-thumbnailer.in
b/data/etc_apport_report-ignore_lomiri-thumbnailer.in
+similarity index 100%
+rename from data/etc_apport_blacklist.d_lomiri-thumbnailer.in
+rename to data/etc_apport_report-ignore_lomiri-thumbnailer.in
+--
+2.37.2
+
diff -Nru lomiri-thumbnailer-3.0.1/debian/patches/series
lomiri-thumbnailer-3.0.1/debian/patches/series
--- lomiri-thumbnailer-3.0.1/debian/patches/series 2023-02-05
17:03:53.000000000 +0100
+++ lomiri-thumbnailer-3.0.1/debian/patches/series 2023-02-17
11:26:53.000000000 +0100
@@ -1,3 +1,4 @@
+1001_rename_apport_directory.patch
2001_dont-check-whitespaces-in-debian-subfolder.patch
1300_disable_qml_and_dbus_tests.patch
2001_ignore-more-file-types-in-copyright-check.patch
