Control: tag -1 pending
Dear maintainer,
I have just uploaded libfm/1.3.0.2-1.1, fixing this bug, to DELAYED/5;
the relevant patches are attached to this mail. Feel free to reschedule
or cancel my upload as you see fit.
BTW: You may want to check the debian branch in your Salsa repository,
it contains the changes made to data/libfm.conf by
debian/patches/01-lxde-conf.patch which caused trouble as I tried to
build the package using git-buildpackge.
Cheers,
-Hilko
>From b6195aae8c33dafe6ee6d5d78daea1597dea6c53 Mon Sep 17 00:00:00 2001
From: Hilko Bengen <ben...@debian.org>
Date: Thu, 13 Dec 2018 23:05:31 +0100
Subject: [PATCH 1/2] Add patch that unsets G_DISABLE_ASSERT in test program
before including glib-related header files (Closes: #907945)
---
debian/patches/02-fix-test.patch | 20 ++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 21 insertions(+)
create mode 100644 debian/patches/02-fix-test.patch
diff --git a/debian/patches/02-fix-test.patch b/debian/patches/02-fix-test.patch
new file mode 100644
index 0000000..8e71a64
--- /dev/null
+++ b/debian/patches/02-fix-test.patch
@@ -0,0 +1,20 @@
+Index: libfm/src/tests/test-fm-path.c
+===================================================================
+--- libfm.orig/src/tests/test-fm-path.c
++++ libfm/src/tests/test-fm-path.c
+@@ -19,13 +19,13 @@
+ * MA 02110-1301, USA.
+ */
+
+-#include <fm.h>
+-
+ //ignore for test disabled asserts
+ #ifdef G_DISABLE_ASSERT
+ #undef G_DISABLE_ASSERT
+ #endif
+
++#include <fm.h>
++
+ #define TEST_PARSING(func, str_to_parse, ...) \
+ G_STMT_START { \
+ const char* expected[] = {__VA_ARGS__}; \
diff --git a/debian/patches/series b/debian/patches/series
index 98b24d0..5aef66b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01-lxde-conf.patch
+02-fix-test.patch
--
2.11.0
>From 5a2923617d03497485f9503506576790b402554c Mon Sep 17 00:00:00 2001
From: Hilko Bengen <ben...@debian.org>
Date: Thu, 13 Dec 2018 23:06:18 +0100
Subject: [PATCH 2/2] Debian release 1.3.0.2-1.1
---
debian/changelog | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 42b9b38..2817c22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libfm (1.3.0.2-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Add patch that unsets G_DISABLE_ASSERT in test program before
+ including glib-related header files (Closes: #907945)
+
+ -- Hilko Bengen <ben...@debian.org> Thu, 13 Dec 2018 23:05:41 +0100
+
libfm (1.3.0.2-1) unstable; urgency=medium
* Updating debian/copyright file.
--
2.11.0
