Merge branch 'upstream' into debian/sid

6 files changed, 73 insertions, 53 deletions

diff --git a/man/man8/sisu_faq.8 b/man/man8/sisu_faq.8
index 308f6a21..72b4e0f6 100644
--- a/man/man8/sisu_faq.8
+++ b/man/man8/sisu_faq.8
@@ -1,4 +1,4 @@
-.TH "sisu_faq" "1" "2007-09-16" "0.59.0" "SiSU"
+.TH "sisu_faq" "1" "2007-09-16" "0.59.1" "SiSU"
 .SH
 SISU \- FAQ \- FREQUENTLY ASKED/ANSWERED QUESTIONS,
 RALPH AMISSAH
@@ -353,7 +353,7 @@ Sourcefile Digest, MD5(sisu_faq.sst)=
 
 .BR
 Skin_Digest:
-MD5(/home/ralph/grotto/theatre/dbld/sisu\-dev/sisu/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb)=
+MD5(/home/ralph/grotto/theatre/dbld/builds/sisu/sisu/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb)=
 .I 20fc43cf3eb6590bc3399a1aef65c5a9
 
 .BR
@@ -361,13 +361,13 @@ MD5(/home/ralph/grotto/theatre/dbld/sisu\-dev/sisu/data/doc/sisu/sisu_markup_sam
 
 .BR
 Document (metaverse) last generated:
-.I Mon Sep 24 15:36:17 +0100 2007
+.I Tue Sep 25 02:54:46 +0100 2007
 
 .BR
 Generated by:
 .I SiSU
-.I 0.59.0
-of 2007w38/0 (2007\-09\-23)
+.I 0.59.1
+of 2007w39/2 (2007\-09\-25)
 
 .BR
 Ruby version:
@@ -393,10 +393,10 @@ pdf: <http://www.jus.uio.no/sisu/sisu_faq/landscape.pdf>
 at: <http://www.jus.uio.no/sisu>
 .TP
 .TP
-* Generated by: SiSU 0.59.0 of 2007w38/0 (2007-09-23)
+* Generated by: SiSU 0.59.1 of 2007w39/2 (2007-09-25)
 .TP
 * Ruby version: ruby 1.8.6 (2007-06-07 patchlevel 36) [i486-linux]
 .TP
-* Last Generated on: Mon Sep 24 15:36:32 +0100 2007
+* Last Generated on: Tue Sep 25 02:54:51 +0100 2007
 .TP
 * SiSU http://www.jus.uio.no/sisu
diff --git a/man/man8/sisu_howto.8 b/man/man8/sisu_howto.8
index 3aebd30b..7717fd7d 100644
--- a/man/man8/sisu_howto.8
+++ b/man/man8/sisu_howto.8
@@ -1,4 +1,4 @@
-.TH "sisu_howto" "1" "2007-09-16" "0.59.0" "SiSU"
+.TH "sisu_howto" "1" "2007-09-16" "0.59.1" "SiSU"
 .SH
 SISU \- TECHNICAL, HOWTO,
 RALPH AMISSAH
@@ -1333,10 +1333,10 @@ other things provides the dependencies of sisu within
   Standards\-Version: 3.7.2
   Package: sisu
   Architecture: all
-  Depends: ruby (>= 1.8.2), libwebrick\-ruby, unzip, zip
+  Depends: ruby (>= 1.8.2), ruby (<< 1.9), libwebrick\-ruby, unzip, zip
   Conflicts: vim\-sisu, sisu\-vim, sisu\-remote
   Replaces: vim\-sisu, sisu\-vim
-  Recommends: sisu\-pdf, sisu\-sqlite, sisu\-postgresql, hyperestraier, keychain, librmagick\-ruby, librexml\-ruby, openssl, openssh\-client | lsh\-client, rsync, tidy, vim\-addon\-manager
+  Recommends: sisu\-doc, sisu\-pdf, sisu\-sqlite, sisu\-postgresql, hyperestraier, keychain, librmagick\-ruby, librexml\-ruby, openssl, openssh\-client | lsh\-client, rsync, tidy, vim\-addon\-manager
   Suggests: kdissert, lv, rcs | cvs, pinfo, texinfo, trang
   Description: documents \- structuring, publishing in multiple formats and search
    SiSU is a lightweight markup based, command line oriented, document
@@ -1379,13 +1379,14 @@ other things provides the dependencies of sisu within
 .nf
   Package: sisu\-complete
   Architecture: all
-  Depends: ruby (>= 1.8.2), sisu, sisu\-pdf, sisu\-postgresql, sisu\-sqlite
+  Depends: ruby (>= 1.8.2), ruby (<< 1.9), sisu, sisu\-doc, sisu\-pdf, sisu\-postgresql, sisu\-sqlite
   Recommends: hyperestraier
   Description: installs all SiSU related packages
    This package installs SiSU and related packages that enable sisu to produce
    pdf and to populate postgresql and sqlite databases.
    \.
-   SiSU is a lightweight markup based document publishing framework.
+   SiSU is a lightweight markup based document structuring, publishing and search
+   framework for document collections.
    \.
    See sisu for a description of the package.
    \.
@@ -1394,14 +1395,31 @@ other things provides the dependencies of sisu within
 
 
 .nf
+  Package: sisu\-doc
+  Architecture: all
+  Depends: sisu
+  Recommends: sisu\-pdf, sisu\-postgresql, sisu\-sqlite
+  Description: sisu manual and other documentation for sisu
+   Multiple file formats generated output of sisu documentation generated from
+   sisu markup source documents included in the main package
+   \.
+   SiSU is a lightweight markup based document structuring, publishing and search
+   framework for document collections.
+   \.
+    Homepage: <http://www.jus.uio.no/sisu>
+.fi
+
+
+.nf
   Package: sisu\-pdf
   Architecture: all
   Depends: sisu, texlive\-latex\-base, texlive\-fonts\-recommended, texlive\-latex\-recommended, texlive\-latex\-extra
-  #Suggests: evince, xpdf
+  Recommends: sisu\-doc
   Description: dependencies to convert SiSU LaTeX output to pdf
    This package enables the conversion of SiSU LaTeX output to pdf.
    \.
-   SiSU is a lightweight markup based document publishing framework.
+   SiSU is a lightweight markup based document structuring, publishing and search
+   framework for document collections.
    \.
     Homepage: <http://www.jus.uio.no/sisu>
 .fi
@@ -1411,7 +1429,7 @@ other things provides the dependencies of sisu within
   Package: sisu\-postgresql
   Architecture: all
   Depends: sisu, libdbd\-pg\-ruby, libdbi\-ruby, libdbm\-ruby, postgresql
-  Recommends: libfcgi\-ruby
+  Recommends: sisu\-doc, libfcgi\-ruby
   Suggests: postgresql\-contrib
   Description: SiSU dependencies for use with postgresql database
    This package enables SiSU to populate a postgresql database. This is done at
@@ -1423,7 +1441,8 @@ other things provides the dependencies of sisu within
    identified by object citation number, from which an index of documents
    matched and each matched paragraph within them can be displayed.
    \.
-   SiSU is a lightweight markup based document publishing framework.
+   SiSU is a lightweight markup based document structuring, publishing and search
+   framework for document collections.
    \.
     Homepage: <http://www.jus.uio.no/sisu>
 .fi
@@ -1433,7 +1452,7 @@ other things provides the dependencies of sisu within
   Package: sisu\-sqlite
   Architecture: all
   Depends: sisu, sqlite, libdbd\-sqlite\-ruby, libdbi\-ruby, libdbm\-ruby
-  Recommends: libfcgi\-ruby
+  Recommends: sisu\-doc, libfcgi\-ruby
   Description: SiSU dependencies for use with sqlite database
    This package enables SiSU to populate an sqlite database. This is done at an
    object/paragraph level, making granular searches of documents possible.
@@ -1444,7 +1463,8 @@ other things provides the dependencies of sisu within
    identified by object citation number, from which an index of documents
    matched and each matched paragraph within them can be displayed.
    \.
-   SiSU is a lightweight markup based document publishing framework.
+   SiSU is a lightweight markup based document structuring, publishing and search
+   framework for document collections.
    \.
     Homepage: <http://www.jus.uio.no/sisu>
 .fi
@@ -2198,11 +2218,11 @@ Filetype:
 
 .BR
 Sourcefile Digest, MD5(sisu_howto.sst)=
-.I bb17770a0fa5b4ef035ebf0bcfca3faa
+.I c0491e0093434f4d962ce3b59e4985ca
 
 .BR
 Skin_Digest:
-MD5(/home/ralph/grotto/theatre/dbld/sisu\-dev/sisu/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb)=
+MD5(/home/ralph/grotto/theatre/dbld/builds/sisu/sisu/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb)=
 .I 20fc43cf3eb6590bc3399a1aef65c5a9
 
 .BR
@@ -2210,13 +2230,13 @@ MD5(/home/ralph/grotto/theatre/dbld/sisu\-dev/sisu/data/doc/sisu/sisu_markup_sam
 
 .BR
 Document (metaverse) last generated:
-.I Mon Sep 24 15:36:16 +0100 2007
+.I Tue Sep 25 02:54:45 +0100 2007
 
 .BR
 Generated by:
 .I SiSU
-.I 0.59.0
-of 2007w38/0 (2007\-09\-23)
+.I 0.59.1
+of 2007w39/2 (2007\-09\-25)
 
 .BR
 Ruby version:
@@ -2272,10 +2292,10 @@ pdf: <http://www.jus.uio.no/sisu/sisu_howto/landscape.pdf>
 at: <http://www.jus.uio.no/sisu>
 .TP
 .TP
-* Generated by: SiSU 0.59.0 of 2007w38/0 (2007-09-23)
+* Generated by: SiSU 0.59.1 of 2007w39/2 (2007-09-25)
 .TP
 * Ruby version: ruby 1.8.6 (2007-06-07 patchlevel 36) [i486-linux]
 .TP
-* Last Generated on: Mon Sep 24 15:36:31 +0100 2007
+* Last Generated on: Tue Sep 25 02:54:51 +0100 2007
 .TP
 * SiSU http://www.jus.uio.no/sisu
diff --git a/man/man8/sisu_quickstart.8 b/man/man8/sisu_quickstart.8
index eb952758..5d03d4fc 100644
--- a/man/man8/sisu_quickstart.8
+++ b/man/man8/sisu_quickstart.8
@@ -1,4 +1,4 @@
-.TH "sisu_quickstart" "1" "2007-09-16" "0.59.0" "SiSU"
+.TH "sisu_quickstart" "1" "2007-09-16" "0.59.1" "SiSU"
 .SH
 SISU \- QUICKSTART, INSTALLATION AND USE,
 RALPH AMISSAH
@@ -449,7 +449,7 @@ Sourcefile Digest, MD5(sisu_quickstart.sst)=
 
 .BR
 Skin_Digest:
-MD5(/home/ralph/grotto/theatre/dbld/sisu\-dev/sisu/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb)=
+MD5(/home/ralph/grotto/theatre/dbld/builds/sisu/sisu/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb)=
 .I 20fc43cf3eb6590bc3399a1aef65c5a9
 
 .BR
@@ -457,13 +457,13 @@ MD5(/home/ralph/grotto/theatre/dbld/sisu\-dev/sisu/data/doc/sisu/sisu_markup_sam
 
 .BR
 Document (metaverse) last generated:
-.I Mon Sep 24 15:36:15 +0100 2007
+.I Tue Sep 25 02:54:45 +0100 2007
 
 .BR
 Generated by:
 .I SiSU
-.I 0.59.0
-of 2007w38/0 (2007\-09\-23)
+.I 0.59.1
+of 2007w39/2 (2007\-09\-25)
 
 .BR
 Ruby version:
@@ -504,10 +504,10 @@ pdf: <http://www.jus.uio.no/sisu/sisu_quickstart/landscape.pdf>
 at: <http://www.jus.uio.no/sisu>
 .TP
 .TP
-* Generated by: SiSU 0.59.0 of 2007w38/0 (2007-09-23)
+* Generated by: SiSU 0.59.1 of 2007w39/2 (2007-09-25)
 .TP
 * Ruby version: ruby 1.8.6 (2007-06-07 patchlevel 36) [i486-linux]
 .TP
-* Last Generated on: Mon Sep 24 15:36:31 +0100 2007
+* Last Generated on: Tue Sep 25 02:54:51 +0100 2007
 .TP
 * SiSU http://www.jus.uio.no/sisu
diff --git a/man/man8/sisu_remote.8 b/man/man8/sisu_remote.8
index 94ba07f1..41d836e1 100644
--- a/man/man8/sisu_remote.8
+++ b/man/man8/sisu_remote.8
@@ -1,4 +1,4 @@
-.TH "sisu_remote" "1" "2007-09-16" "0.59.0" "SiSU"
+.TH "sisu_remote" "1" "2007-09-16" "0.59.1" "SiSU"
 .SH
 SISU \- REMOTE OPERATIONS,
 RALPH AMISSAH
@@ -205,7 +205,7 @@ Sourcefile Digest, MD5(sisu_remote.sst)=
 
 .BR
 Skin_Digest:
-MD5(/home/ralph/grotto/theatre/dbld/sisu\-dev/sisu/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb)=
+MD5(/home/ralph/grotto/theatre/dbld/builds/sisu/sisu/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb)=
 .I 20fc43cf3eb6590bc3399a1aef65c5a9
 
 .BR
@@ -213,13 +213,13 @@ MD5(/home/ralph/grotto/theatre/dbld/sisu\-dev/sisu/data/doc/sisu/sisu_markup_sam
 
 .BR
 Document (metaverse) last generated:
-.I Mon Sep 24 15:36:17 +0100 2007
+.I Tue Sep 25 02:54:46 +0100 2007
 
 .BR
 Generated by:
 .I SiSU
-.I 0.59.0
-of 2007w38/0 (2007\-09\-23)
+.I 0.59.1
+of 2007w39/2 (2007\-09\-25)
 
 .BR
 Ruby version:
@@ -242,10 +242,10 @@ pdf: <http://www.jus.uio.no/sisu/sisu_remote/landscape.pdf>
 at: <http://www.jus.uio.no/sisu>
 .TP
 .TP
-* Generated by: SiSU 0.59.0 of 2007w38/0 (2007-09-23)
+* Generated by: SiSU 0.59.1 of 2007w39/2 (2007-09-25)
 .TP
 * Ruby version: ruby 1.8.6 (2007-06-07 patchlevel 36) [i486-linux]
 .TP
-* Last Generated on: Mon Sep 24 15:36:32 +0100 2007
+* Last Generated on: Tue Sep 25 02:54:51 +0100 2007
 .TP
 * SiSU http://www.jus.uio.no/sisu
diff --git a/man/man8/sisu_search.8 b/man/man8/sisu_search.8
index bb0b6301..bbe444e4 100644
--- a/man/man8/sisu_search.8
+++ b/man/man8/sisu_search.8
@@ -1,4 +1,4 @@
-.TH "sisu_search" "1" "2007-09-16" "0.59.0" "SiSU"
+.TH "sisu_search" "1" "2007-09-16" "0.59.1" "SiSU"
 .SH
 SISU \- SEARCH,
 RALPH AMISSAH
@@ -568,7 +568,7 @@ Sourcefile Digest, MD5(sisu_search._sst)=
 
 .BR
 Skin_Digest:
-MD5(/home/ralph/grotto/theatre/dbld/sisu\-dev/sisu/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb)=
+MD5(/home/ralph/grotto/theatre/dbld/builds/sisu/sisu/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb)=
 .I 20fc43cf3eb6590bc3399a1aef65c5a9
 
 .BR
@@ -576,13 +576,13 @@ MD5(/home/ralph/grotto/theatre/dbld/sisu\-dev/sisu/data/doc/sisu/sisu_markup_sam
 
 .BR
 Document (metaverse) last generated:
-.I Mon Sep 24 15:36:19 +0100 2007
+.I Tue Sep 25 02:54:48 +0100 2007
 
 .BR
 Generated by:
 .I SiSU
-.I 0.59.0
-of 2007w38/0 (2007\-09\-23)
+.I 0.59.1
+of 2007w39/2 (2007\-09\-25)
 
 .BR
 Ruby version:
@@ -630,10 +630,10 @@ pdf: <http://www.jus.uio.no/sisu/sisu_search/landscape.pdf>
 at: <http://www.jus.uio.no/sisu>
 .TP
 .TP
-* Generated by: SiSU 0.59.0 of 2007w38/0 (2007-09-23)
+* Generated by: SiSU 0.59.1 of 2007w39/2 (2007-09-25)
 .TP
 * Ruby version: ruby 1.8.6 (2007-06-07 patchlevel 36) [i486-linux]
 .TP
-* Last Generated on: Mon Sep 24 15:36:32 +0100 2007
+* Last Generated on: Tue Sep 25 02:54:52 +0100 2007
 .TP
 * SiSU http://www.jus.uio.no/sisu
diff --git a/man/man8/sisu_syntax_highlighting.8 b/man/man8/sisu_syntax_highlighting.8
index a148d8e0..ab43f9ff 100644
--- a/man/man8/sisu_syntax_highlighting.8
+++ b/man/man8/sisu_syntax_highlighting.8
@@ -1,4 +1,4 @@
-.TH "sisu_syntax_highlighting" "1" "2007-09-16" "0.59.0" "SiSU"
+.TH "sisu_syntax_highlighting" "1" "2007-09-16" "0.59.1" "SiSU"
 .SH
 SISU \- SYNTAX HIGHLIGHTING,
 RALPH AMISSAH
@@ -261,7 +261,7 @@ Sourcefile Digest, MD5(sisu_syntax_highlighting.sst)=
 
 .BR
 Skin_Digest:
-MD5(/home/ralph/grotto/theatre/dbld/sisu\-dev/sisu/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb)=
+MD5(/home/ralph/grotto/theatre/dbld/builds/sisu/sisu/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb)=
 .I 20fc43cf3eb6590bc3399a1aef65c5a9
 
 .BR
@@ -269,13 +269,13 @@ MD5(/home/ralph/grotto/theatre/dbld/sisu\-dev/sisu/data/doc/sisu/sisu_markup_sam
 
 .BR
 Document (metaverse) last generated:
-.I Mon Sep 24 15:36:17 +0100 2007
+.I Tue Sep 25 02:54:46 +0100 2007
 
 .BR
 Generated by:
 .I SiSU
-.I 0.59.0
-of 2007w38/0 (2007\-09\-23)
+.I 0.59.1
+of 2007w39/2 (2007\-09\-25)
 
 .BR
 Ruby version:
@@ -298,10 +298,10 @@ pdf: <http://www.jus.uio.no/sisu/sisu_syntax_highlighting/landscape.pdf>
 at: <http://www.jus.uio.no/sisu>
 .TP
 .TP
-* Generated by: SiSU 0.59.0 of 2007w38/0 (2007-09-23)
+* Generated by: SiSU 0.59.1 of 2007w39/2 (2007-09-25)
 .TP
 * Ruby version: ruby 1.8.6 (2007-06-07 patchlevel 36) [i486-linux]
 .TP
-* Last Generated on: Mon Sep 24 15:36:32 +0100 2007
+* Last Generated on: Tue Sep 25 02:54:51 +0100 2007
 .TP
 * SiSU http://www.jus.uio.no/sisu