updated to 0.6.11

[packages/docbook-utils.git] / docbook-utils-catalog.patch

diff --git a/docbook-utils-catalog.patch b/docbook-utils-catalog.patch
index 0efb9e7d6c3b29c646d802bb123093cfd101b4fb..e3f62bbf537ef0497850c7c4c07f154dc8d68a04 100644 (file)
--- a/docbook-utils-catalog.patch
+++ b/docbook-utils-catalog.patch
@@ -1,16 +1,36 @@
---- docbook-utils-0.6.10/frontends/docbook.in.wiget    Mon Apr 15 18:58:21 2002
-+++ docbook-utils-0.6.10/frontends/docbook.in  Sun May 26 02:03:10 2002
-@@ -6,13 +6,7 @@
+--- docbook-utils-0.6.11/frontends/docbook.in.wiget    Fri Jun 28 10:37:48 2002
++++ docbook-utils-0.6.11/frontends/docbook.in  Fri Jun 28 10:38:53 2002
+@@ -6,33 +6,7 @@
  # Give the location of the centralized catalog
  # First try the one with a version matching the version that is indicated in the document
    centralized-catalog)
--      SGML_VERSION=`grep -i '<!DOCTYPE' $SGML_FILE | head -n 1 | sed 's/\(V[0-9][\.0-9]*\).*$/\1/; s/^.* V\([0-9][\.0-9]*\)/\1/'`
--      if [ -f "${SGML_CATALOGS_DIR}/${SGML_XML}-docbook-${SGML_VERSION}"*".cat" ]
--      then echo "${SGML_CATALOGS_DIR}/${SGML_XML}-docbook-${SGML_VERSION}"*".cat"
--      elif [ "${SGML_XML}" != "sgml" ]
--      then echo "${SGML_CATALOGS_DIR}/${SGML_XML}-docbook.cat"
--      else echo "${SGML_CATALOGS_DIR}/catalog"
+-      if [ -n "$SGML_NORM" ]; then
+-        SGML_NORM_OPTS='-d'
+-      else
+-        SGML_NORM=cat
+-        SGML_NORM_OPTS=
 -      fi
+-      SGML_VERSION=`"$SGML_NORM" $SGML_NORM_OPTS -- "$SGML_FILE" 2>/dev/null |
+-                      grep -i '<!DOCTYPE' |
+-                      head -n 1 |
+-                      sed 's/^.*DocBook\( XML\)\? V\([0-9][\.0-9]*\).*$/\2/'`
+-      SGML_CATALOG=
+-      for f in "${SGML_CATALOGS_DIR}/${SGML_XML}-docbook-${SGML_VERSION}"*".cat"
+-      do 
+-        if [ -f "$f" ]
+-        then
+-          SGML_CATALOG=$f
+-          break
+-        fi
+-      done
+-      if [ -z "SGML_CATALOG" ]
+-      then
+-        if [ "${SGML_XML}" != "sgml" ]
+-        then SGML_CATALOG=${SGML_CATALOGS_DIR}/${SGML_XML}-docbook.cat
+-        else SGML_CATALOG=${SGML_CATALOGS_DIR}/catalog
+-        fi
+-      fi
+-      echo "$SGML_CATALOG"
 +      echo "${SGML_CATALOGS_DIR}/catalog"
        ;;
  # Find a stylesheet on the model "html/docbook.dsl" or "print/docbook.dsl"