various versioning related things (like using the svn version number), fix a broken link in the developer-guide

svn path=/trunk/; revision=13196

4 files changed, 29 insertions, 17 deletions

diff --git a/docbook/Makefile b/docbook/Makefile
index 6551443732..c573747666 100644
--- a/docbook/Makefile
+++ b/docbook/Makefile
@@ -53,6 +53,14 @@ clean:
 
 eug: eug_validate eug_pdf_a4 eug_html eug_html_chunked eug_chm 
 
+#
+# on every build, record the working copy revision string
+#
+svn_version.xml::
+	echo -n '<!ENTITY SvnVersion "' > svn_version.xml
+	svnversion -n .                   >> svn_version.xml
+	echo '">'   >> svn_version.xml
+    
 eug_images:
 	cp $(DOCBOOKXSL)/images/note.png ./graphics
 	cp $(DOCBOOKXSL)/images/tip.png ./graphics
@@ -64,7 +72,7 @@ eug_validate:
 	$(XMLLINT) --valid --noout user-guide.xml
 
 # create html single page file
-eug_html: eug_images
+eug_html: eug_images svn_version.xml
 	@ echo --- HTML SINGLE PAGE ---
 	mkdir -p eug_html
 	mkdir -p eug_html/graphics
@@ -74,7 +82,7 @@ eug_html: eug_images
 	$(XSLTPROC) --nonet $(DOCBOOKXSL)/html/docbook.xsl user-guide.xml > eug_html/user-guide.html
 	
 # create html chunked page files
-eug_html_chunked: eug_images
+eug_html_chunked: eug_images svn_version.xml
 	@ echo --- HTML CHUNKED ---
 	mkdir -p eug_html_chunked
 	mkdir -p eug_html_chunked/graphics
@@ -85,7 +93,7 @@ eug_html_chunked: eug_images
 
 # create pdf file (through XSL-FO), portrait pages on US letter paper (the default)
 # you will get lot's of errors, but that's ok
-eug_pdf_us: eug_images
+eug_pdf_us: eug_images svn_version.xml
 ifdef FOP
 	@ echo --- PDF US PAPER ---
 	$(XSLTPROC) --nonet custom_layer_pdf.xsl $(DOCBOOKXSL)/fo/docbook.xsl user-guide.xml > user-guide.fo
@@ -94,7 +102,7 @@ endif
 
 # create pdf file (through XSL-FO), portrait pages on A4 paper
 # you will get lot's of errors, but that's ok
-eug_pdf_a4: eug_images
+eug_pdf_a4: eug_images svn_version.xml
 ifdef FOP
 	@ echo --- PDF A4 PAPER ---
 	$(XSLTPROC) --stringparam paper.type A4 --nonet custom_layer_pdf.xsl user-guide.xml > user-guide.fo
@@ -102,7 +110,7 @@ ifdef FOP
 endif
 
 # create MS html help file (through html chunked pages)
-eug_chm: eug_images
+eug_chm: eug_images svn_version.xml
 ifdef HHC
 	@ echo --- MICROSOFT HTML HELP ---
 	mkdir -p eug_chm
@@ -132,7 +140,7 @@ edg_validate:
 	$(XMLLINT) --valid --noout developer-guide.xml
 
 # create html single page file
-edg_html: edg_images
+edg_html: edg_images svn_version.xml
 	@ echo --- HTML SINGLE PAGE ---
 	mkdir -p edg_html
 	mkdir -p edg_html/edg_graphics
@@ -140,7 +148,7 @@ edg_html: edg_images
 	$(XSLTPROC) --nonet $(DOCBOOKXSL)/html/docbook.xsl developer-guide.xml > edg_html/developer-guide.html
 	
 # create html chunked page files
-edg_html_chunked: edg_images
+edg_html_chunked: edg_images svn_version.xml
 	@ echo --- HTML CHUNKED ---
 	mkdir -p edg_html_chunked
 	mkdir -p edg_html_chunked/edg_graphics
@@ -149,7 +157,7 @@ edg_html_chunked: edg_images
 
 # create pdf file (through XSL-FO), portrait pages on US letter paper (the default)
 # you will get lot's of errors, but that's ok
-edg_pdf_us: edg_images
+edg_pdf_us: edg_images svn_version.xml
 ifdef FOP
 	@ echo --- PDF US PAPER ---
 	$(XSLTPROC) --nonet custom_layer_pdf.xsl $(DOCBOOKXSL)/fo/docbook.xsl developer-guide.xml > developer-guide.fo
@@ -158,7 +166,7 @@ endif
 
 # create pdf file (through XSL-FO), portrait pages on A4 paper
 # you will get lot's of errors, but that's ok
-edg_pdf_a4: edg_images
+edg_pdf_a4: edg_images svn_version.xml
 ifdef FOP
 	@ echo --- PDF A4 PAPER ---
 	$(XSLTPROC) --stringparam paper.type A4 --nonet custom_layer_pdf.xsl developer-guide.xml > developer-guide.fo
@@ -166,7 +174,7 @@ ifdef FOP
 endif
 
 # create MS html help file (through html chunked pages)
-edg_chm: edg_images
+edg_chm: edg_images svn_version.xml
 ifdef HHC
 	@ echo --- MICROSOFT HTML HELP ---
 	mkdir -p edg_chm
diff --git a/docbook/developer-guide.xml b/docbook/developer-guide.xml
index dff9013351..7e5427afc8 100644
--- a/docbook/developer-guide.xml
+++ b/docbook/developer-guide.xml
@@ -28,15 +28,17 @@ DOCUMENT SECTION
 -->
 
   <!ENTITY DocumentTitle "<application>Ethereal</application> Developer's Guide">
-  <!ENTITY DocumentSubTitle "&DocumentVersion; for Ethereal &EtherealCurrentVersion;">
+  <!ENTITY DocumentSubTitle "&DocumentVersion; (&SvnVersion;) for Ethereal &EtherealCurrentVersion;">
   <!ENTITY DocumentTitleAbbreviation "EDG">
 
   <!ENTITY DocumentCopyrightHolder "Ulf Lamping">
-  <!ENTITY DocumentCopyrightYear "2004">
+  <!ENTITY DocumentCopyrightYear "2004-2005">
 
   <!ENTITY DocumentEdition "Draft">
-  <!ENTITY DocumentVersion "Draft 0.01">
-  <!ENTITY DocumentPubDate "2004">
+  <!ENTITY DocumentVersion "Draft 0.0.2">
+  <!ENTITY DocumentPubDate "2005">
+  <!ENTITY % SvnVersionFile SYSTEM "svn_version.xml">
+  %SvnVersionFile;
 
 <!ENTITY DocumentLegalNotice "<para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.</para><para>All logos and trademarks in this document are property of their respective owner.</para>">
 
@@ -51,7 +53,7 @@ DOCUMENT SECTION
 <!--
 Ethereal Info
 -->
-  <!ENTITY EtherealCurrentVersion "0.10.6">
+  <!ENTITY EtherealCurrentVersion "0.10.9">
 
 <!--
 FILE SECTION
@@ -60,7 +62,7 @@ FILE SECTION
 
 <!-- These refer to graphics files and figures contained in the document -->
 
-  <!ENTITY EtherealLogo SYSTEM "./graphics/ethereal-logo.png" NDATA PNG>
+  <!ENTITY EtherealLogo SYSTEM "./edg_graphics/ethereal-logo.png" NDATA PNG>
   <!ENTITY EtherealFunctionBlocks SYSTEM "./edg_graphics/ethereal-function-blocks.png" NDATA PNG>
 
 <!-- These are the actual files that make up the document -->
diff --git a/docbook/edg_graphics/ethereal-logo.png b/docbook/edg_graphics/ethereal-logo.png
new file mode 100644
index 0000000000..46eefa6fbb
--- /dev/null
+++ b/docbook/edg_graphics/ethereal-logo.png
diff --git a/docbook/user-guide.xml b/docbook/user-guide.xml
index 4ac0d9838a..ca075f2c4e 100644
--- a/docbook/user-guide.xml
+++ b/docbook/user-guide.xml
@@ -53,7 +53,7 @@ DOCUMENT SECTION
 -->
 
   <!ENTITY DocumentTitle "<application>Ethereal</application> User's Guide">
-  <!ENTITY DocumentSubTitle "&DocumentVersion; for Ethereal &EtherealCurrentVersion;">
+  <!ENTITY DocumentSubTitle "&DocumentVersion; (&SvnVersion;) for Ethereal &EtherealCurrentVersion;">
   <!ENTITY DocumentTitleAbbreviation "EUG">
 
   <!ENTITY DocumentCopyrightHolder1 "Richard Sharpe">
@@ -65,6 +65,8 @@ DOCUMENT SECTION
   <!ENTITY DocumentVersion "V2.0.2">
   <!ENTITY DocumentPubDate "2005">
 
+  <!ENTITY % SvnVersionFile SYSTEM "svn_version.xml">
+  %SvnVersionFile;
 <!ENTITY DocumentLegalNotice "<para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.</para><para>All logos and trademarks in this document are property of their respective owner.</para>">
 
 <!--