Updated acinclude.m4 to increase portability; fixed a minor packaging bug in debian...

git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@78 64e312b2-a51f-0410-8e61-82d0ca0eb02a

diff --git a/check/ChangeLog b/check/ChangeLog
index 2033a24637b185b5139b6dab35447a16dd31c014..fbbebb214ace0b54619004162efd15fc487eb9ac 100644 (file)
--- a/check/ChangeLog
+++ b/check/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-18 05:28  amalec
+
+       * ChangeLog, doc/index.html: index.html changes
+
 2001-08-18 05:24  amalec
 
        * INSTALL, NEWS: NEWS and INSTALL changes

diff --git a/check/acinclude.m4 b/check/acinclude.m4
index 74c4fb58ea6ff10630a29dca135974fc4fb4d86e..7c687adbd59b9384a36a8755008364aef83adcec 100644 (file)
--- a/check/acinclude.m4
+++ b/check/acinclude.m4
@@ -10,13 +10,13 @@ ck_lyxharddir='/usr/local/share/lyx'
 ck_lyxldir="$ck_lyxpath/../lib"
 ck_lyxsdir="$ck_lyxpath/../share/lyx"
 for ck_path in "$ck_lyxenvdir" "$ck_lyxldir" "$ck_lyxsdir" "$ck_lyxharddir"; do
-       if test -n "$ck_path" -a -e "$ck_path/$ck_lyxchkconfig" ; then
+       if test \( -n "$ck_path" -a -r "$ck_path/$ck_lyxchkconfig" \) ; then
                ck_lyxlibdir="$ck_path"
                break
        fi
 done
 
-if grep "^\"linuxdoc" "$ck_lyxlibdir/textclass.lst" &> /dev/null; then
+if grep "^\"linuxdoc" "$ck_lyxlibdir/textclass.lst" > /dev/null 2>&1; then
        AC_MSG_RESULT([yes])
        [$1]
 else

diff --git a/check/aclocal.m4 b/check/aclocal.m4
index ba1fe77f94ebfdff533834320ec25b3397326b11..b032fef26b9addbf53057f9cf3da1ffc7c643427 100644 (file)
--- a/check/aclocal.m4
+++ b/check/aclocal.m4
@@ -22,13 +22,13 @@ ck_lyxharddir='/usr/local/share/lyx'
 ck_lyxldir="$ck_lyxpath/../lib"
 ck_lyxsdir="$ck_lyxpath/../share/lyx"
 for ck_path in "$ck_lyxenvdir" "$ck_lyxldir" "$ck_lyxsdir" "$ck_lyxharddir"; do
-       if test -n "$ck_path" -a -e "$ck_path/$ck_lyxchkconfig" ; then
+       if test \( -n "$ck_path" -a -r "$ck_path/$ck_lyxchkconfig" \) ; then
                ck_lyxlibdir="$ck_path"
                break
        fi
 done
 
-if grep "^\"linuxdoc" "$ck_lyxlibdir/textclass.lst" &> /dev/null; then
+if grep "^\"linuxdoc" "$ck_lyxlibdir/textclass.lst" > /dev/null 2>&1; then
        AC_MSG_RESULT([yes])
        [$1]
 else

diff --git a/check/configure b/check/configure
index ffa7655e6d4b230a62c63bd3bda152ff9f32609b..2d6a811111150bcec6a577113a115e696ad9c30e 100755 (executable)
--- a/check/configure
+++ b/check/configure
@@ -693,7 +693,7 @@ fi
 
 PACKAGE=check
 
-VERSION=0.7.2
+VERSION=0.7.3
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1184,13 +1184,13 @@ ck_lyxharddir='/usr/local/share/lyx'
 ck_lyxldir="$ck_lyxpath/../lib"
 ck_lyxsdir="$ck_lyxpath/../share/lyx"
 for ck_path in "$ck_lyxenvdir" "$ck_lyxldir" "$ck_lyxsdir" "$ck_lyxharddir"; do
-       if test -n "$ck_path" -a -e "$ck_path/$ck_lyxchkconfig" ; then
+       if test \( -n "$ck_path" -a -r "$ck_path/$ck_lyxchkconfig" \) ; then
                ck_lyxlibdir="$ck_path"
                break
        fi
 done
 
-if grep "^\"linuxdoc" "$ck_lyxlibdir/textclass.lst" &> /dev/null; then
+if grep "^\"linuxdoc" "$ck_lyxlibdir/textclass.lst" > /dev/null 2>&1; then
        echo "$ac_t""yes" 1>&6
        have_lyx="yes"
 else

diff --git a/check/configure.in b/check/configure.in
index 3a36f5a735aae1a2cec8713fb5683f296d2d2197..60b31de9bf0b1f135ef63eb21a16ce748e2e3472 100644 (file)
--- a/check/configure.in
+++ b/check/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/check.c)
-AM_INIT_AUTOMAKE(check,0.7.2)
+AM_INIT_AUTOMAKE(check,0.7.3)
 AC_ARG_ENABLE(plain_docdir,
 [  --enable-plain-docdir        don't append version information to docdir],
 [case "${enableval}" in

diff --git a/check/debian/changelog b/check/debian/changelog
index ce84b31c6267cd5bbee26e4a18bbf43ee9b5f175..a5aaa5ac46c7536725dfed9d331df6119c953bb9 100644 (file)
--- a/check/debian/changelog
+++ b/check/debian/changelog
@@ -1,3 +1,10 @@
+check (0.7.3-1) unstable; urgency=low
+
+  * Bug fix to Autoconf macro for shell portability & to debian doc-base
+    file
+
+ -- Arien Malec <amalec@debian>  Tue, 21 Aug 2001 17:44:24 +0000
+
 check (0.7.2-1) unstable; urgency=low
 
   * Initial Release.

diff --git a/check/debian/check.doc-base.tut b/check/debian/check.doc-base.tut
index 39d4ba8f883ebe587dd845fbdd23566da3b967b3..e31c2a48b7519e709cb89f5c6e4a0dc1e3e80e01 100644 (file)
--- a/check/debian/check.doc-base.tut
+++ b/check/debian/check.doc-base.tut
@@ -5,11 +5,11 @@ Abstract: This document presents a tutorial introduction to the use of Check.
 Section: Apps/Programming
      
 Format: lyx
-Files: /usr/share/doc/check/example.lyx.gz
+Files: /usr/share/doc/check/tutorial.lyx.gz
 
 Format: linuxdoc-sgml
-Files: /usr/share/doc/check/example.sgml.gz
+Files: /usr/share/doc/check/tutorial.sgml.gz
 
 Format: HTML
-Index: /usr/share/doc/check/example.html
-Files: /usr/share/doc/check/example*.html
+Index: /usr/share/doc/check/tutorial.html
+Files: /usr/share/doc/check/tutorial*.html

diff --git a/check/debian/files b/check/debian/files
index ad2a251150c1c45eb65ed3ff29ccf80c86babfe1..723de4e53a7870ed2caaaa1310bec227df3b0947 100644 (file)
--- a/check/debian/files
+++ b/check/debian/files
@@ -1 +1 @@
-check_0.7.2-1_i386.deb devel optional
+check_0.7.3-1_i386.deb devel optional

diff --git a/check/rpm/check.spec b/check/rpm/check.spec
index e19b8f5d7503c6409dab890d563ebbb6b515aefe..54df0658d2b32bb239a429743e39e3e235f8000e 100644 (file)
--- a/check/rpm/check.spec
+++ b/check/rpm/check.spec
@@ -1,9 +1,9 @@
 Summary: A unit test framework for C
 Name: check
-Version: 0.7.2
+Version: 0.7.3
 Release: 1
 Epoch: 1
-Source: http://prdownloads.sourceforge.net/check/check-0.7.2.tar.gz
+Source: http://prdownloads.sourceforge.net/check/check-0.7.3.tar.gz
 Group: Development/Tools
 Copyright: GPL
 URL: http://check.sourceforge.net
@@ -57,6 +57,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc %{_prefix}/share/doc/%{name}-%{version}/examples/Makefile.am.money
 
 %changelog
+* Mon Aug 21 2001 Arien Malec <arien_malec@yahoo.com>
+- Updated for 0.7.3
 * Mon Aug 6 2001 Arien Malec <arien_malec@yahoo.com>
 - Updated for 0.7.2
 - Moved money example files to example subdirectory, and removed some