Import of release 0.7.1

9 files changed, 38 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index 5352d5b..af8058b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-29  Henning Makholm  <henning@makholm.net>
+
+	* Version 0.7.1
+	* A few cosmetic changes done during debianization
+	* The code now passes the testsuite on several Debian
+	  architectures (powerpc, alpha, ia64, amd64, hppa,
+	  sparc, mipsel, m68k). Unfortunately I lack the
+	  access to test on non-Debian platforms.
+
 2006-01-28  Henning Makholm  <henning@makholm.net>
 
 	* Version 0.7
diff --git a/Makefile.in b/Makefile.in
index 57ea4f9..6dc0cef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -73,11 +73,13 @@ testscale$e: testscale.$o
 install: all
 	for p in $(BINARIES) ; do \
 	  $(INSTALL_PROGRAM) -s $$p \
-		$(bindir)/`echo $$p | $(SED) $(program_transform_name)` ; \
+	    $(bindir)/`echo $$p | $(SED) $(program_transform_name)` \
+	    || exit 1 ;\
         done
 	for m in $(MANPAGES) ; do \
 	  $(INSTALL_DATA) $$m \
-	       $(mandir)/man1/`echo $$m | $(SED) $(program_transform_name)` ; \
+	    $(mandir)/man1/`echo $$m | $(SED) $(program_transform_name)` \
+	    || exit 1 ; \
 	done
 
 ENUMSOURCES = gimp/base-enums.h gimp/gimpbaseenums.h gimp/xcf-private.h
@@ -120,7 +122,7 @@ check: $(BINARIES)
 	cd test && $(MAKE) check
 
 clean:
-	$(RM) *.$o *~ .*~ *.1i *.1il *.1 *.oi 
+	$(RM) *.$o */*~ *~ .*~ *.1i *.1il *.1 *.oi 
 	$(RM) enums.h enums.c table.c $(BINARIES)
 	cd test && $(MAKE) clean
 
@@ -143,7 +145,7 @@ dist: ajour distclean
 	noncvs > notcvsfiles || cp dist-generated notcvsfiles
 	diff -u dist-generated notcvsfiles
 	$(RM) notcvsfiles
-	find . -type f -print | grep -v CVS | \
+	find . -type f -print | grep -v CVS | grep -v debian | \
 		sed 's!^\./!$(APPNAME)-$(VERSION)/!' | sort -o tar-manifest
 	ln -s . $(APPNAME)-$(VERSION)
 	tar cvzf $(APPNAME)-$(VERSION).tar.gz `cat tar-manifest`
diff --git a/README b/README
index 60eef04..5990bf2 100644
--- a/README
+++ b/README
@@ -28,7 +28,7 @@ layers named on the command line.
 Portability
 ===========
 
-The software was developed on an Intel-based pc running Debian
+The software was developed on an Intel-based PC running Debian
 GNU/Linux. It ought to work on other Linux variants also. I would
 not be surprised if it ran on other unix systems too, but porting
 to non-unix platforms will require some work. Most of the code
diff --git a/TODO b/TODO
index b182571..bdd6a80 100644
--- a/TODO
+++ b/TODO
@@ -3,8 +3,6 @@ number of Xcftools to 1.0:
 
 - Add tests of error reporting to the test suite.
 
-- Get the program tested on various architectures.
-
 - Finish localization infrastucture (some work has been done
   but is not completely systematic).
 
diff --git a/configure b/configure
index d189d8a..63989dd 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,6 @@
 #! /bin/sh
-# From configure.ac Id: configure.ac.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for Xcftools 0.7.
+# Generated by GNU Autoconf 2.59 for Xcftools 0.7.1.
 #
 # Report bugs to <henning@makholm.net>.
 #
@@ -274,8 +273,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='Xcftools'
 PACKAGE_TARNAME='xcftools'
-PACKAGE_VERSION='0.7'
-PACKAGE_STRING='Xcftools 0.7'
+PACKAGE_VERSION='0.7.1'
+PACKAGE_STRING='Xcftools 0.7.1'
 PACKAGE_BUGREPORT='henning@makholm.net'
 
 ac_unique_file="xcfinfo.c"
@@ -785,7 +784,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 Xcftools 0.7 to adapt to many kinds of systems.
+\`configure' configures Xcftools 0.7.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -851,7 +850,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Xcftools 0.7:";;
+     short | recursive ) echo "Configuration of Xcftools 0.7.1:";;
    esac
   cat <<\_ACEOF
 
@@ -975,7 +974,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-Xcftools configure 0.7
+Xcftools configure 0.7.1
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -993,7 +992,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Xcftools $as_me 0.7, which was
+It was created by Xcftools $as_me 0.7.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1332,7 +1331,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
 echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
@@ -5126,7 +5124,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by Xcftools $as_me 0.7, which was
+This file was extended by Xcftools $as_me 0.7.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5186,7 +5184,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Xcftools config.status 0.7
+Xcftools config.status 0.7.1
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index c337371..849a5d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,11 +17,10 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 dnl
 dnl ------------------------
 dnl The following line is the MASTER SOURCE for the version number
-AC_INIT(Xcftools,0.7,henning@makholm.net,xcftools)
+AC_INIT(Xcftools,0.7.1,henning@makholm.net,xcftools)
 AC_COPYRIGHT(General copyright notice for AC_PACKAGE_NAME:
    [@COPYRIGHT@  Henning Makholm]
 )
-AC_REVISION($Id: configure.ac,v 1.6 2006/01/28 21:02:16 makholm Exp $)
 AC_CONFIG_SRCDIR(xcfinfo.c)
         
 AC_PROG_MAKE_SET
diff --git a/test/README b/test/README
index d7d0006..d09d955 100644
--- a/test/README
+++ b/test/README
@@ -17,6 +17,13 @@ implementation of -@ and/or insert filters in the test driver
 routines.
 
 
+The test asssumes that xcftools has been compiled with an
+iconv() library that can expand non-ASCII characters to
+approximating ASCII sequenced, possibly triggered by the
+'//TRANSLIT' convention of glibc. If this is not the case
+you have to do appropriate corrections when the 'AE=AE' layer
+is mentioned by the test script.
+
 
 There are yet no tests for correct reporting of errors.
 
diff --git a/test/dotest b/test/dotest
index c444c98..0bb6115 100755
--- a/test/dotest
+++ b/test/dotest
@@ -19,7 +19,7 @@
 export LC_CTYPE=C
 export LC_MESSAGES=C
 
-TESTFROM=..
+: ${XCFTOOLS_PREFIX=../}
 
 totaltests=0
 failedtests=0
@@ -70,7 +70,7 @@ testrun() {
 }
 
 testinfo() {
-    testrun $TESTFROM/xcfinfo "$@"
+    testrun ${XCFTOOLS_PREFIX}xcfinfo "$@"
 }
 
 testpnm() {
@@ -105,7 +105,8 @@ testpnm() {
     fi
     source="$1"
     shift
-    testrun $TESTFROM/xcf2pnm -@ -oo.$oext $aopt source/$source.xcf.gz "$@"
+    testrun ${XCFTOOLS_PREFIX}xcf2pnm \
+        -@ -oo.$oext $aopt source/$source.xcf.gz "$@"
     [ -z "$oanswer" ] || cmp o.want o.$oext || failed
     [ -z "$aanswer" ] || cmp a.want a.pnm || failed
 }
@@ -137,7 +138,7 @@ testpng() {
     pngtopnm -alpha answer/$answer.png | $afilter > a.want
     source="$1"
     shift
-    testrun $TESTFROM/xcf2png -oo.png source/$source.xcf.gz "$@"
+    testrun ${XCFTOOLS_PREFIX}xcf2png -oo.png source/$source.xcf.gz "$@"
     perl pngtype.pl < o.png > pngtype
     diff -u pngtype.want pngtype || failed
     pngtopnm $oargs o.png > o.pnm
diff --git a/xcf2png.10 b/xcf2png.10
index 06312c0..b82d8e4 100644
--- a/xcf2png.10
+++ b/xcf2png.10
@@ -31,7 +31,6 @@ is a command-line tool that converts image files in the XCF format used by
 .BR gimp (1)
 to the generic image format
 .BR png ,
-.BR ppm (5),
 flattening layers if necessary. It does not need to have
 the Gimp engine itself available.
 .SH GENERAL OPTIONS