[Lunar-commits] CVS: moonbase/doc-tools/docbook-sgml BUILD, 1.3, 1.4 DETAILS, 1.5, 1.6 POST_INSTALL, 1.6, 1.7

[Moritz Heiber]

Update of /var/cvs/lunar/moonbase/doc-tools/docbook-sgml
In directory espresso.foo-projects.org:/tmp/cvs-serv13315/docbook-sgml

Modified Files:
	BUILD DETAILS POST_INSTALL 
Log Message:
Well, what can I say. I've been working on this for 10 hours straight
(Yes, ten hours). I just couldn't stand how broken docbook* was.

Everything is now updatable independently, there is nothing left behind
in any global configuration file. I also updated a couple of those modules
as they really deserved it.

Scheme change:

docbook-3.1 replaces any docbook-3.x module
docbook-sgml replaces any docbook-4.x module

iso832943-whatever was deprecated.
The /etc/xml/catalog rebuild is now done by a dynamic file fetched from
docbook.org (yeah, I know Nick, you modified it to fit in with Lunar ..
unfortunately you didn't catch up).

sgml-common has been sanitized.

Tested with gcc 3.3.3, 2.6.x and scrollkeeper, docbook-utils, glade2, gtk-doc
and a hell lot of others I probably forgot. Enjoy.

Oh and .. bow before your god.
(j/k)

PS: Thanks to the folks at BLFS .. without them I would have been clueless
(occasionally)


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/doc-tools/docbook-sgml/BUILD,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- BUILD	15 Feb 2005 11:50:11 -0000	1.3
+++ BUILD	16 Feb 2005 02:19:58 -0000	1.4
@@ -1,10 +1,17 @@
 (
   TARGET=/usr/share/sgml/docbook/$MODULE-$VERSION
- 
+  
+  # We need to remove the old catalog entries
+  if module_is_expired $MODULE ; then
+        set_module_config OLD_VER "`installed_version $MODULE`"
+  fi &&
+
   prepare_install &&
   if ! [ -d "$TARGET" ]; then
        mkdir -p $TARGET
   fi &&
+  
+  rm -rf $SOURCE_DIRECTORY/old.libraries &&
 
   for DFILE in $SOURCE_DIRECTORY/*; do
 	install -m644 $DFILE $TARGET/

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/doc-tools/docbook-sgml/DETAILS,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- DETAILS	15 Feb 2005 11:50:12 -0000	1.5
+++ DETAILS	16 Feb 2005 02:19:58 -0000	1.6
@@ -1,12 +1,12 @@
           MODULE=docbook-sgml
              MOD=docbook
-         VERSION=4.2
+         VERSION=4.3
           SOURCE=$MOD-$VERSION.zip
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/tmp
-      SOURCE_URL=http://www.oasis-open.org/docbook/sgml/4.2/
-        WEB_SITE=http://www.oasis-open.org/docbook/sgml/4.2/index.shtml
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/tmp-$MODULE
+      SOURCE_URL=http://www.oasis-open.org/docbook/sgml/4.3/
+        WEB_SITE=http://www.oasis-open.org/docbook/sgml/4.3/index.shtml
          ENTERED=20030103
-         UPDATED=20030804
+         UPDATED=20050215
            SHORT="The DocBook SGML DTD"
 cat << EOF
 

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/doc-tools/docbook-sgml/POST_INSTALL,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- POST_INSTALL	15 Feb 2005 11:50:12 -0000	1.6
+++ POST_INSTALL	16 Feb 2005 02:19:58 -0000	1.7
@@ -1,5 +1,7 @@
+OLD_VER=`get_module_config OLD_VER`
 CENTRALIZED=/etc/sgml/catalog 
-DOCBOOK_INSTALL_DIR=/usr/share/sgml/docbook/$MODULE-$VERSION
+CATALOGDIR=/usr/share/sgml/docbook/$MODULE-$VERSION
+CATALOGDIR_OLD=/usr/share/sgml/docbook/$MODULE-$OLD_VER
 
 if ! [ -e "$CENTRALIZED" ]; then
      echo "Creating $CENTRALIZED"
@@ -7,5 +9,30 @@
      touch $CENTRALIZED
 fi
 
-install-catalog --add $CENTRALIZED $DOCBOOK_INSTALL_DIR/catalog
-install-catalog -r $CENTRALIZED /etc/sgml/catalog
+if [ ! -z $OLD_VER ]; then
+  install-catalog --remove $CENTRALIZED $CATALOGDIR_OLD/catalog
+fi
+
+install-catalog --remove $CENTRALIZED $CATALOGDIR/catalog
+
+install-catalog --add $CENTRALIZED $CATALOGDIR/catalog
+install-catalog --remove $CENTRALIZED /etc/sgml/catalog
+
+if ! grep -q "/usr/share/sgml/docbook/$MODULE-$VERSION" $CENTRALIZED; then
+   /usr/bin/install-catalog --remove $CENTRALIZED $CATALOGDIR
+fi
+
+# We do not have any other docbook's installed
+cat >> $CATALOGDIR/catalog << "EOF"
+  -- Begin Single Major Version catalog changes --
+
+PUBLIC "-//OASIS//DTD DocBook V4.2//EN" "docbook.dtd"
+PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd"
+PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd"
+
+  -- End Single Major Version catalog changes --
+EOF
+
+if module_installed docbook-xml; then lin -c docbook-xml; fi
+
+unset_module_config OLD_VER