2007-05-14 [colin] 2.9.2cvs8
authorColin Leroy <colin@colino.net>
Mon, 14 May 2007 20:03:50 +0000 (20:03 +0000)
committerColin Leroy <colin@colino.net>
Mon, 14 May 2007 20:03:50 +0000 (20:03 +0000)
* manual/xml2pdf
Fix bashism, search for xml catalog
in /usr/local/share/xml/catalog too
Patch by Pawel

ChangeLog
PATCHSETS
configure.ac
manual/xml2pdf

index 3c3183f..e0e15a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-14 [colin]     2.9.2cvs8
+
+       * manual/xml2pdf
+               Fix bashism, search for xml catalog 
+               in /usr/local/share/xml/catalog too
+               Patch by Pawel
+
 2007-05-13 [wwp]       2.9.2cvs7
 
        * src/gtk/logwindow.c
index f3a0633..944677f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.204.2.133 -r 1.204.2.134 src/prefs_common.c;  cvs diff -u -r 1.103.2.81 -r 1.103.2.82 src/prefs_common.h;  cvs diff -u -r 1.1.2.70 -r 1.1.2.71 src/gtk/quicksearch.c;  ) > 2.9.2cvs5.patchset
 ( cvs diff -u -r 1.2.2.33 -r 1.2.2.34 src/gtk/filesel.c;  ) > 2.9.2cvs6.patchset
 ( cvs diff -u -r 1.1.4.29 -r 1.1.4.30 src/gtk/logwindow.c;  ) > 2.9.2cvs7.patchset
+( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/xml2pdf;  ) > 2.9.2cvs8.patchset
index df64227..4b93a53 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=7
+EXTRA_VERSION=8
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 0c6631a..d30fa0a 100644 (file)
@@ -44,7 +44,8 @@ then
        CATALOG_FILES=$XML_CATALOG_FILES
 else
        echo "warning: XML_CATALOG_FILES is not set or empty"
-       CATALOG_FILES="/usr/local/etc/xml/catalog /etc/xml/catalog $HOME/xml/catalog"
+       CATALOG_FILES="/usr/local/etc/xml/catalog /etc/xml/catalog
+                       /usr/local/share/xml/catalog $HOME/xml/catalog"
 fi
 KEY="http://docbook.sourceforge.net/release/xsl/current"
 
@@ -65,8 +66,8 @@ do
                                continue
                fi
 
-               test "${DOCBOOKXSLPATH:0:7}" == "file://" && \
-                       DOCBOOKXSLPATH=${DOCBOOKXSLPATH:7}
+               test "`echo ${DOCBOOKXSLPATH} | cut -c 1-7`" = "file://" && \
+                       DOCBOOKXSLPATH=`echo ${DOCBOOKXSLPATH} | cut -c 8-`
                if [ -n "$DOCBOOKXSLPATH" ]
                then
                        echo "docbook-xsl path found: $DOCBOOKXSLPATH"