New upstream version 5.2.13

5 files changed, 25 insertions, 15 deletions

diff --git a/scripts/autogen.sh b/scripts/autogen.sh
index 102ca99..312887a 100644
--- a/scripts/autogen.sh
+++ b/scripts/autogen.sh
@@ -279,11 +279,11 @@ test -z "$convertloc" && {
 
 # Check for docbook version 4
 # Note workaround for Fedora installation
-# Include path for Fedora Docbook. A bit circuitous, but Fedora appends 
-# a bunch of extra stuff to the name of the directory-- including the 
-# version of Fedora (eg -fc9).  We don't want to test for every version 
-# of Fedora and modern bourne shells won't expand the glob (*); 
-# therefore, we do a `find` first and then test to see if there are any 
+# Include path for Fedora Docbook. A bit circuitous, but Fedora appends
+# a bunch of extra stuff to the name of the directory-- including the
+# version of Fedora (eg -fc9).  We don't want to test for every version
+# of Fedora and modern bourne shells won't expand the glob (*);
+# therefore, we do a `find` first and then test to see if there are any
 # results.
 
 if test -d /usr/share/sgml/docbook ;  then
diff --git a/scripts/gversion b/scripts/gversion
index eda0dc0..1fde387 100755
--- a/scripts/gversion
+++ b/scripts/gversion
@@ -3,17 +3,17 @@
 # Parse git version into its separate components.
 #
 # Copyright (C) 2017 Robert Krawitz
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2, or (at your option)
 # any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/scripts/gversion.in b/scripts/gversion.in
index 1b4512b..f4dfad3 100755
--- a/scripts/gversion.in
+++ b/scripts/gversion.in
@@ -3,17 +3,17 @@
 # Parse git version into its separate components.
 #
 # Copyright (C) 2017 Robert Krawitz
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2, or (at your option)
 # any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
diff --git a/scripts/mkgitlog b/scripts/mkgitlog
index 27adf1c..3a5eb2b 100755
--- a/scripts/mkgitlog
+++ b/scripts/mkgitlog
@@ -53,9 +53,14 @@ sub print_it {
 	map { $add += $addlines{$_} } @files;
 	map { $remove += $removelines{$_} } @files;
 	print "	Lines: +$add, -$remove\n";
-	print "	Files:\n";
+	print "	Files:";
+	my ($fcount) = 0;
 	foreach my $fn (@files) {
-	    print "		$fn (";
+	    if ($fcount++ == 0) {
+		print "	$fn (";
+	    } else {
+		print "		$fn (";
+	    }
 	    if ($filechanges{$fn} eq 'D') {
 		print "removed -$removelines{$fn}";
 	    } elsif ($filechanges{$fn} eq 'C') {
diff --git a/scripts/mkgitlog.in b/scripts/mkgitlog.in
index 719bfea..48837f7 100644
--- a/scripts/mkgitlog.in
+++ b/scripts/mkgitlog.in
@@ -53,9 +53,14 @@ sub print_it {
 	map { $add += $addlines{$_} } @files;
 	map { $remove += $removelines{$_} } @files;
 	print "	Lines: +$add, -$remove\n";
-	print "	Files:\n";
+	print "	Files:";
+	my ($fcount) = 0;
 	foreach my $fn (@files) {
-	    print "		$fn (";
+	    if ($fcount++ == 0) {
+		print "	$fn (";
+	    } else {
+		print "		$fn (";
+	    }
 	    if ($filechanges{$fn} eq 'D') {
 		print "removed -$removelines{$fn}";
 	    } elsif ($filechanges{$fn} eq 'C') {