From c6740b2095f57641b7e7bab5e8b92b3f9700c240 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Sat, 7 Nov 2015 06:01:54 +0100
Subject: Merging upstream version 1.3.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
---
 ChangeLog    |  4 ++--
 INSTALL      |  2 +-
 README       | 11 +++++++----
 configure    | 22 +++++++++++-----------
 doc/lunzip.1 |  2 +-
 5 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c999a79..6bf6a9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
-2013-05-18  Antonio Diaz Diaz  <antonio@gnu.org>
+2013-06-18  Antonio Diaz Diaz  <antonio@gnu.org>
 
-	* Version 1.3-rc1 released.
+	* Version 1.3 released.
 	* Decompression time has been reduced by 1%.
 	* main.c (show_header): Show header version if verbosity >= 4.
 	* Ignore option '-n, --threads' for compatibility with plzip.
diff --git a/INSTALL b/INSTALL
index 2ec1487..af0ee97 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 Requirements
 ------------
 You will need a C compiler.
-I use gcc 4.8.0 and 3.3.6, but the code should compile with any
+I use gcc 4.8.1 and 3.3.6, but the code should compile with any
 standards compliant compiler.
 Gcc is available at http://gcc.gnu.org.
 
diff --git a/README b/README
index f02c51b..7606a77 100644
--- a/README
+++ b/README
@@ -5,9 +5,9 @@ small size makes it well suited for embedded devices or software
 installers that need to decompress files but do not need compression
 capabilities.
 
-Lunzip uses the same well-defined exit status values used by bzip2,
-which makes it safer when used in pipes or scripts than compressors
-returning ambiguous warning values, like gzip.
+Lunzip uses the same well-defined exit status values used by lzip and
+bzip2, which makes it safer when used in pipes or scripts than
+decompressors returning ambiguous warning values, like gunzip.
 
 The 4 factor integrity checking of the lzip format guarantees that the
 decompressed version of the data is identical to the original. This
@@ -18,7 +18,10 @@ occurs upon decompression, so it can only tell you that something is
 wrong. It can't help you recover the original uncompressed data.
 
 If you ever need to recover data from a damaged lzip file, try the
-lziprecover program.
+lziprecover program. Lziprecover makes lzip files resistant to bit-flip,
+one of the most common forms of data corruption, and its recovery
+capabilities contribute to make of the lzip format one of the best
+options for long-term data archiving.
 
 Lunzip replaces every file given in the command line with a decompressed
 version of itself. Each decompressed file has the same modification
diff --git a/configure b/configure
index 5ce6cc3..ce1d275 100755
--- a/configure
+++ b/configure
@@ -6,7 +6,7 @@
 # to copy, distribute and modify it.
 
 pkgname=lunzip
-pkgversion=1.3-rc1
+pkgversion=1.3
 progname=lunzip
 srctrigger=doc/lunzip.1
 
@@ -26,9 +26,8 @@ CFLAGS='-Wall -W -O2'
 LDFLAGS=
 
 # checking whether we are using GNU C.
-if [ ! -x /bin/gcc ] &&
-   [ ! -x /usr/bin/gcc ] &&
-   [ ! -x /usr/local/bin/gcc ] ; then
+${CC} --version > /dev/null 2>&1
+if [ $? != 0 ] ; then
 	CC=cc
 	CFLAGS='-W -O2'
 fi
@@ -96,16 +95,19 @@ while [ $# != 0 ] ; do
 	CFLAGS=*)     CFLAGS=${optarg} ;;
 	LDFLAGS=*)   LDFLAGS=${optarg} ;;
 
-	--* | *=* | *-*-*) ;;
+	--*)
+		echo "configure: WARNING: unrecognized option: '${option}'" 1>&2 ;;
+	*=* | *-*-*) ;;
 	*)
-		echo "configure: Unrecognized option: \"${option}\"; use --help for usage." 1>&2
+		echo "configure: unrecognized option: '${option}'" 1>&2
+		echo "Try 'configure --help' for more information." 1>&2
 		exit 1 ;;
 	esac
 
 	# Check if the option took a separate argument
 	if [ "${arg2}" = yes ] ; then
 		if [ $# != 0 ] ; then args="${args} \"$1\"" ; shift
-		else echo "configure: Missing argument to \"${option}\"" 1>&2
+		else echo "configure: Missing argument to '${option}'" 1>&2
 			exit 1
 		fi
 	fi
@@ -123,10 +125,8 @@ if [ -z "${srcdir}" ] ; then
 fi
 
 if [ ! -r "${srcdir}/${srctrigger}" ] ; then
-	exec 1>&2
-	echo
-	echo "configure: Can't find sources in ${srcdir} ${srcdirtext}"
-	echo "configure: (At least ${srctrigger} is missing)."
+	echo "configure: Can't find sources in ${srcdir} ${srcdirtext}" 1>&2
+	echo "configure: (At least ${srctrigger} is missing)." 1>&2
 	exit 1
 fi
 
diff --git a/doc/lunzip.1 b/doc/lunzip.1
index 8fe9741..e04ac0e 100644
--- a/doc/lunzip.1
+++ b/doc/lunzip.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH LUNZIP "1" "May 2013" "Lunzip 1.3-rc1" "User Commands"
+.TH LUNZIP "1" "June 2013" "Lunzip 1.3" "User Commands"
 .SH NAME
 Lunzip \- small decompressor for lzip files
 .SH SYNOPSIS
-- 
cgit v1.2.3