From 2afdcaef74b80a9326d0c00f6afa688f9d1be76e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 8 Dec 2016 17:40:36 +0000
Subject: [PATCH] debian/changelog does not allow tabs

---
 ChangeLog                   | 10 ++++++++++
 ax_init_standard_project.m4 |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c96a1b3..18eb311 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2016-12-08 15:02  
+
+	* [r455] ax_init_standard_project.m4, build-in-docker.sh:
+	  fixed debian changelog, rpm package signing and mageia update
+
+2016-12-08 10:00  
+
+	* [r454] ChangeLog, build-in-docker.sh:
+	  fixed update problem in mageia
+
 2016-12-07 20:34  
 
 	* [r453] bootstrap.sh, build-in-docker.sh:
diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index 9b3c21c..73b5d04 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -198,7 +198,7 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   _AM_SUBST_NOTMAKE([CHANGELOG])
   DEB_CHANGELOG=$(sed '/^[[^\t]]/{h;N;d};s,\t,  ,g;/^  \* /{s,,,;H;g;s,^,  * ,;s,\n\([[^ ]]*\) *, \1\n    ,}' ChangeLog)
   if test -z "$DEB_CHANGELOG"; then
-    DEB_CHANGELOG="	* see file ChangeLog and project management web site"
+    DEB_CHANGELOG="  * see file ChangeLog and project management web site"
   fi
   AC_SUBST(DEB_CHANGELOG)
   _AM_SUBST_NOTMAKE([DEB_CHANGELOG])
@@ -220,6 +220,8 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${AUTHOR_URL}/downloads/${PACKAGE_NAME}}"
   AX_SUBST(PROJECT_URL)
   AX_SUBST(SOURCE_DOWNLOAD)
+  VENDOR=$((lsb_release -is 2>/dev/null || echo unknown) | tr ' ' '_')
+  AX_SUBST(VENDOR)
   DISTRO=$(lsb_release -sc 2>/dev/null || uname -s 2>/dev/null)
   AX_SUBST(DISTRO)
   ARCH=$((@<:@@<:@ $(uname -sm) =~ 64 @:>@@:>@ && echo amd64) || (@<:@@<:@ $(uname -sm) =~ 'i?86' @:>@@:>@ && echo i386 || uname -sm))