From 64eb844d82a0b3df57fc69a15b871bb37f06d1dc Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Tue, 30 Mar 2010 18:45:48 +1100 Subject: [PATCH] Import Jari Aalto's patches and prepare for 0.45 --- AUTHORS | 7 ++++--- Makefile.in | 12 +++++++++--- WHATS-NEW | 9 +++++++++ configure | 22 +++++++++++----------- configure.ac | 2 +- lrztar | 2 +- man/Makefile | 34 ++++++++++++++++++++++++++++++++++ man/lrunzip.1.pod | 10 +++++----- man/lrztar.1.pod | 10 +++++----- pod2man.mk => man/pod2man.mk | 0 10 files changed, 79 insertions(+), 29 deletions(-) create mode 100755 man/Makefile rename pod2man.mk => man/pod2man.mk (100%) diff --git a/AUTHORS b/AUTHORS index acd5a49..fdf895a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,12 +5,13 @@ patches, multi-threading support, assembler integration, SDK updating, and autoconf improvements. Thanks to: -Andrew Tridgell for rzip. -Markus Oberhumer for lzo. -Igor Pavlov for lzma and CRC Assembler code. +Andrew Tridgell for rzip +Markus Oberhumer for lzo +Igor Pavlov for lzma and CRC Assembler code Jean-loup Gailly and Mark Adler for the zlib compression library Christian Leber for lzma compat layer Lasse Collin for debugging the compat layer Michael J Cohen for Darwin support Jukka Laurila for newer Darwin support George Makrydakis for lrztar +Jari Aalto for documentation and typos and git help diff --git a/Makefile.in b/Makefile.in index 8611c2f..7178202 100644 --- a/Makefile.in +++ b/Makefile.in @@ -51,14 +51,19 @@ DOCFILES= AUTHORS BUGS ChangeLog COPYING README README-NOT-BACKWARD-COMPATIBLE \ DOCFILES_LZMA= lzma/7zC.txt lzma/7zFormat.txt lzma/Methods.txt \ lzma/history.txt lzma/lzma.txt lzma/README lzma/README-Alloc -MAN1FILES= man/lrzip.1 +MAN1FILES= man/lrzip.1 man/lrunzip.1 man/lrztar.1 MAN5FILES= man/lrzip.conf.5 #note that the -I. is needed to handle config.h when using VPATH .c.o: $(CC) $(CFLAGS) $(LZMA_CFLAGS) $< -o $@ -all: lrzip man doc +all: lrzip make-man man doc + +make-man: + $(MAKE) -C man + +.PHONY: make-man 7zCrcT8.o: @top_srcdir@/lzma/C/7zCrcT8.c $(CC) $(CFLAGS) $(LZMA_CFLAGS) @top_srcdir@/lzma/C/7zCrcT8.c @@ -114,7 +119,8 @@ static: $(OBJS) $(CXX) $(LDFLAGS) -static -o lrzip $(OBJS) $(LIBS) clean: - -${RM} *~ $(OBJS) lrzip config.cache config.log config.status *.o + -${RM} *~ $(OBJS) lrzip config.cache config.log config.status *.o \ + man/lrunzip.1 man/lrztar.1 distclean: clean -rm -rf autom4te.cache config.h Makefile diff --git a/WHATS-NEW b/WHATS-NEW index c7fde4d..4d3af13 100644 --- a/WHATS-NEW +++ b/WHATS-NEW @@ -1,3 +1,12 @@ +lrzip-0.45 + +Added docs for lrztar and lrunzip. +Added distclean and maintainer-clean make targets. +Created git repo: http://github.com/ckolivas/lrzip + +Con Kolivas +March 2010 + lrzip-0.44 Added an lrztar wrapper to compress / decompress whole directories (finally). diff --git a/configure b/configure index 2abaa71..4dcf5e3 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for lrzip 0.44. +# Generated by GNU Autoconf 2.65 for lrzip 0.45. # # Report bugs to . # @@ -551,9 +551,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='lrzip' -PACKAGE_TARNAME='lrzip-0.44' -PACKAGE_VERSION='0.44' -PACKAGE_STRING='lrzip 0.44' +PACKAGE_TARNAME='lrzip-0.45' +PACKAGE_VERSION='0.45' +PACKAGE_STRING='lrzip 0.45' PACKAGE_BUGREPORT='kernel@kolivas.org' PACKAGE_URL='' @@ -1219,7 +1219,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures lrzip 0.44 to adapt to many kinds of systems. +\`configure' configures lrzip 0.45 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1267,7 +1267,7 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/lrzip-0.44] + --docdir=DIR documentation root [DATAROOTDIR/doc/lrzip-0.45] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1284,7 +1284,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lrzip 0.44:";; + short | recursive ) echo "Configuration of lrzip 0.45:";; esac cat <<\_ACEOF @@ -1373,7 +1373,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -lrzip configure 0.44 +lrzip configure 0.45 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2014,7 +2014,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lrzip $as_me 0.44, which was +It was created by lrzip $as_me 0.45, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -5408,7 +5408,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by lrzip $as_me 0.44, which was +This file was extended by lrzip $as_me 0.45, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5470,7 +5470,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -lrzip config.status 0.44 +lrzip config.status 0.45 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 62caa19..7d6be9b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([lrzip],[0.44],[kernel@kolivas.org],[lrzip-0.44]) +AC_INIT([lrzip],[0.45],[kernel@kolivas.org],[lrzip-0.45]) AC_CONFIG_HEADER(config.h) # see what our system is! AC_CANONICAL_HOST diff --git a/lrztar b/lrztar index c946eef..2d2870f 100755 --- a/lrztar +++ b/lrztar @@ -21,7 +21,7 @@ function lrztar_local() { || { printf "lrztar: invalid option for lrztar %s\n" "$x"; return 1; } done { ! (($#)) || ((v_h)); } && { - printf "lrztar wrapper for compressing/decompressing while directories with lrzip.\n" + printf "lrztar wrapper for compressing/decompressing whole directories with lrzip.\n" printf "usage: lrztar [lrzip options] will compress directory to directory.tar.lrz\n" printf "lrztar -d [lrzip options] will extract directory from directory.tar.lrz\n" printf "lrzip -h will list lrzip options\n" diff --git a/man/Makefile b/man/Makefile new file mode 100755 index 0000000..4d1e707 --- /dev/null +++ b/man/Makefile @@ -0,0 +1,34 @@ +#!/usr/bin/make -f +# +# Copyright information +# +# Copyright (C) 2010 Jari Aalto +# +# License +# +# 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 of the License, 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, see . + +PODCENTER = Lrzip + +all: lrunzip.1 lrztar.1 + +lrunzip.1: lrunzip.1.pod + podchecker $< + $(MAKE) -f pod2man.mk PACKAGE=lrunzip PODCENTER=$(PODCENTER) makeman + +lrztar.1: lrztar.1.pod + podchecker $< + $(MAKE) -f pod2man.mk PACKAGE=lrztar PODCENTER=$(PODCENTER) makeman + +# End of file diff --git a/man/lrunzip.1.pod b/man/lrunzip.1.pod index 8c07ddf..3c4a6e2 100644 --- a/man/lrunzip.1.pod +++ b/man/lrunzip.1.pod @@ -1,6 +1,6 @@ # Copyright # -# Copyright (C) 2004-2009 Jari Aalto +# Copyright (C) 2009-2009 Jari Aalto # # License # @@ -75,9 +75,9 @@ zip(1) Program was written by Con Kolivas. -This manual page was written by Jari Aalto , for -the Debian GNU system (but may be used by others). Released under license -GNU GPL version 2or (at your option) any later version. For more -information about license, visit . +This manual page was written by Jari Aalto (but +may be used by others). Released under license GNU GPL version 2or (at +your option) any later version. For more information about license, +visit . =cut diff --git a/man/lrztar.1.pod b/man/lrztar.1.pod index c361b02..f4fdd2e 100644 --- a/man/lrztar.1.pod +++ b/man/lrztar.1.pod @@ -1,6 +1,6 @@ # Copyright # -# Copyright (C) 2004-2010 Jari Aalto +# Copyright (C) 2009-2010 Jari Aalto # # License # @@ -77,9 +77,9 @@ zip(1) Program was written by Con Kolivas. -This manual page was written by Jari Aalto , for -the Debian GNU system (but may be used by others). Released under license -GNU GPL version 2or (at your option) any later version. For more -information about license, visit . +This manual page was written by Jari Aalto (but +may be used by others). Released under license GNU GPL version 2or (at +your option) any later version. For more information about license, +visit . =cut diff --git a/pod2man.mk b/man/pod2man.mk similarity index 100% rename from pod2man.mk rename to man/pod2man.mk