Control: tags 906606 + patch
Control: tags 906606 + pending
Dear maintainer,
I've prepared an NMU for mypaint-brushes (versioned as 1.3.0-1.1) and
uploaded it to DELAYED/15. Please feel free to tell me if I should
cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru mypaint-brushes-1.3.0/debian/changelog mypaint-brushes-1.3.0/debian/changelog
--- mypaint-brushes-1.3.0/debian/changelog 2018-04-02 03:30:05.000000000 +0300
+++ mypaint-brushes-1.3.0/debian/changelog 2018-09-22 22:47:40.000000000 +0300
@@ -1,3 +1,11 @@
+mypaint-brushes (1.3.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add upstream fix for FTBFS with automake 1.16,
+ thanks to Juhani Numminen. (Closes: #906606)
+
+ -- Adrian Bunk <[email protected]> Sat, 22 Sep 2018 22:47:40 +0300
+
mypaint-brushes (1.3.0-1) unstable; urgency=medium
* Initial release. (Closes: #894578)
diff -Nru mypaint-brushes-1.3.0/debian/patches/0001-autogen-add-automake-1.16-support.patch mypaint-brushes-1.3.0/debian/patches/0001-autogen-add-automake-1.16-support.patch
--- mypaint-brushes-1.3.0/debian/patches/0001-autogen-add-automake-1.16-support.patch 1970-01-01 02:00:00.000000000 +0200
+++ mypaint-brushes-1.3.0/debian/patches/0001-autogen-add-automake-1.16-support.patch 2018-09-22 22:47:27.000000000 +0300
@@ -0,0 +1,29 @@
+From 5a28b3c546d2037df79374aa4aeb1c7ab4d1fdfc Mon Sep 17 00:00:00 2001
+From: Jehan <[email protected]>
+Date: Tue, 27 Mar 2018 19:54:15 +0200
+Subject: autogen: add automake 1.16 support.
+
+Fixes #5.
+
+(cherry picked from commit 1e9109dde3bffd416ed351c3f30ecd6ffd0ca2cd)
+---
+ autogen.sh | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/autogen.sh b/autogen.sh
+index 18ad577..166fc3d 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -90,6 +90,9 @@ fi
+ echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
+ if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then
+ AUTOMAKE=$AUTOMAKE
++elif (automake-1.16 --version) < /dev/null > /dev/null 2>&1; then
++ AUTOMAKE=automake-1.16
++ ACLOCAL=aclocal-1.16
+ elif (automake-1.15 --version) < /dev/null > /dev/null 2>&1; then
+ AUTOMAKE=automake-1.15
+ ACLOCAL=aclocal-1.15
+--
+2.11.0
+
diff -Nru mypaint-brushes-1.3.0/debian/patches/series mypaint-brushes-1.3.0/debian/patches/series
--- mypaint-brushes-1.3.0/debian/patches/series 1970-01-01 02:00:00.000000000 +0200
+++ mypaint-brushes-1.3.0/debian/patches/series 2018-09-22 22:47:40.000000000 +0300
@@ -0,0 +1 @@
+0001-autogen-add-automake-1.16-support.patch
