sisu-doc sub-package introduced and restriction to use of ruby 1.8 branch

13 files changed, 58 insertions, 258 deletions

diff --git a/debian/changelog b/debian/changelog
index ba06a511..c386a649 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sisu (0.58.3-1) unstable; urgency=low
+
+  * new upstream, minor detail, see changelog
+
+ -- Ralph Amissah <ralph@amissah.com>  Thu, 06 Sep 2007 18:35:51 +0100
+
 sisu (0.58.2-1) unstable; urgency=low
 
   * new upstream, detail, composite documents, code-block exception
diff --git a/debian/control b/debian/control
index 19f5832f..1d560989 100644
--- a/debian/control
+++ b/debian/control
@@ -7,10 +7,10 @@ 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
@@ -50,33 +50,49 @@ Description: documents - structuring, publishing in multiple formats and search
 
 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.
  .
   Homepage: <http://www.jus.uio.no/sisu>
 
+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>
+
 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
+#Suggests: evince, xpdf, kpdf
 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>
 
 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
@@ -88,14 +104,15 @@ Description: SiSU dependencies for use with postgresql database
  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>
 
 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.
@@ -106,6 +123,7 @@ Description: SiSU dependencies for use with sqlite database
  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>
diff --git a/debian/man/man7/sisu_complete.7 b/debian/man/man7/sisu_complete.7
deleted file mode 100644
index f41a4154..00000000
--- a/debian/man/man7/sisu_complete.7
+++ /dev/null
@@ -1,43 +0,0 @@
-.\"  Name: SiSU information Structuring Universe
-.\"  Author: Ralph Amissah
-.\"  Description: sisu dummy package to install all the whole of sisu, apart from sisu-examples
-.\"  arch-tag: sisu manpage
-.\"  License: GPL 2 or later
-.\"  Notes: Process this file with
-.\"    groff -man -Tascii sisu.1
-.\"    nroff -man sisu.1 | most
-.\"  |sisu.1|@|^|<url:sisu.1>
-.TH sisu_complete 7  "December 17, 2005" "version 0.34" "sisu \-I"
-.SH NAME
-.B SiSU
-\- Structured information, Serialized Units \- a document publishing system, complete dependency package
-.PP
-.SH SYNOPSIS
-Dummy package installs the whole of SiSU, excluding sisu-examples
-.PP
-sisu\-complete together with sisu\-examples is the whole of sisu
-.\"%% Further Information
-.SH FURTHER INFORMATION
-.PP
-For more information on
-.I SiSU
-see:
-.I <http://www.jus.uio.no/sisu>
-.PP
-or
-.I man sisu
-.SH AUTHOR
-Ralph Amissah
-.I <ralph@amissah.com>
-or
-.I <ralph.amissah@gmail.com>
-.SH SEE
-.BR sisu(1),
-.BR sisu(8),
-.SH ALSO
-.BR sisu_webrick(1),
-.BR sisu_pdf(7)
-.BR sisu_sqlite(7)
-.BR sisu_postgresql(7)
-.BR sisu_vim(7)
-.BR sisu_termsheet(1),
diff --git a/debian/man/man7/sisu_pdf.7 b/debian/man/man7/sisu_pdf.7
deleted file mode 100644
index 2836df06..00000000
--- a/debian/man/man7/sisu_pdf.7
+++ /dev/null
@@ -1,42 +0,0 @@
-.\"  Name: SiSU information Structuring Universe
-.\"  Author: Ralph Amissah
-.\"  Description: sisu pdf package manpage
-.\"  arch-tag: sisu manpage
-.\"  License: GPL 2 or later
-.\"  Notes: Process this file with
-.\"    groff -man -Tascii sisu.1
-.\"    nroff -man sisu.1 | most
-.\"  |sisu.1|@|^|<url:sisu.1>
-.TH sisu_pdf 7  "December 17, 2005" "version 0.34" "sisu \-I"
-.SH NAME
-.B SiSU
-\- Structured information, Serialized Units \- a document publishing system
-.PP
-Dummy package installs the dependencies required to convert LaTeX output from SiSU to pdf
-.SH SYNOPSIS
-.B sisu
-.B \-p
-[filename/wildcard]
-.\"%% Description
-.SH DESCRIPTION
-.B sisu_pdf
-.I is part of SiSU (man sisu)
-sisu_pdf is a dummy package to install dependencies needed for sisu to make rudimentary info files output, documented in man sisu
-.\"%% Further Information
-.SH FURTHER INFORMATION
-.PP
-For more information on
-.I SiSU
-see:
-.I <http://www.jus.uio.no/sisu>
-.PP
-or
-.I man sisu
-.SH AUTHOR
-Ralph Amissah
-.I <ralph@amissah.com>
-or
-.I <ralph.amissah@gmail.com>
-.SH SEE ALSO
-.BR sisu(1),
-.BR sisu(8),
diff --git a/debian/man/man7/sisu_postgresql.7 b/debian/man/man7/sisu_postgresql.7
deleted file mode 100644
index e8cddf1f..00000000
--- a/debian/man/man7/sisu_postgresql.7
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"  Name: SiSU information Structuring
-Universe   .\"  Author: Ralph Amissah .\"
-Description: sisu postgresql package manpage .\"
-arch-tag: sisu manpage .\"  License: GPL 2 or
-later .\"  Notes: Process this file with .\" groff
--man -Tascii sisu.1 .\"    nroff -man sisu.1 |
-most .\"  |sisu.1|@|^|<url:sisu.1> .TH
-sisu_postgresql 7  "September 09, 2006" "version
-0.46" "sisu \-I"
-.SH NAME
-.B SiSU
-\- Structured information, Serialized Units \- a document publishing system, postgresql dependency package
-.PP
-Dummy package to install the dependencies required by SiSU to populate a postgresql database
-.SH SYNOPSIS
-.B sisu
-.I \-D [instruction]
-.PP
-.I \-d  \-\-(sqlite|pg) \-\-[instruction]
-[filename/wildcard if required]
-.PP
-.B sisu
-.I \-\-pgsql \-\-[instruction]
-[filename/wildcard if required]
-.PP
-.\"%% Description
-.SH DESCRIPTION
-.B sisu_postgresql
-.I is part of SiSU (man sisu)
-sisu_postgresql is a dummy dummy package to install dependencies needed for sisu to populate a postgresql database, documented in man sisu
-.\"%% Flags Database
-.SH databases
-.TP
-dbi \- database interface
-.B \-D
-set for
-.I postgresql
-.TP
-.B \-\-pgsql \-\-createall
-initial step, creates required relations (tables, indexes) in existing postgresql database (a database should be created manually and given the same name as working directory, as requested) (rb.dbi)
-.TP
-.B \-\-pgsql \-\-import \-v
-.I [filename/wildcard]
-imports data specified to postgresql db (rb.dbi)
-.TP
-.B \-\-pgsql \-\-update \-v
-.I [filename/wildcard]
-updates/imports specified data to (postgresql) db (rb.dbi)
-.TP
-.B \-\-pgsql \-\-remove \-v
-.I [filename/wildcard]
-removes specified data to (postgresql) db (rb.dbi)
-.TP
-.B \-\-pgsql \-\-dropall
-kills data" and drops (postgresql) db, tables & indexes
-.TP
-.B \-\-pgsql \-\-recreate
-kills data" and drops and rebuilds empty (postgresql) db, tables & indexes
-.RE
-.\"%% Further Information
-.SH FURTHER INFORMATION
-.PP
-For more information on
-.I SiSU
-see:
-.I <http://www.jus.uio.no/sisu>
-.PP
-or
-.I man sisu
-.SH AUTHOR
-Ralph Amissah
-.I <ralph@amissah.com>
-or
-.I <ralph.amissah@gmail.com>
-.SH SEE ALSO
-.BR sisu(1),
-.BR sisu(8),
-.BR sisu_sqlite(7),
-.BR sisu_vim(7)
diff --git a/debian/man/man7/sisu_sqlite.7 b/debian/man/man7/sisu_sqlite.7
deleted file mode 100644
index 8a9c6e3e..00000000
--- a/debian/man/man7/sisu_sqlite.7
+++ /dev/null
@@ -1,78 +0,0 @@
-.\"  Name: SiSU information Structuring Universe
-.\"  Author: Ralph Amissah
-.\"  Description: sisu sqlite package manpage
-.\"  arch-tag: sisu manpage
-.\"  License: GPL 2 or later
-.\"  Notes: Process this file with
-.\"    groff -man -Tascii sisu.1
-.\"    nroff -man sisu.1 | most
-.\"  |sisu.1|@|^|<url:sisu.1>
-.TH sisu_sqlite 7  "September 09, 2006" "version 0.46" "sisu \-I"
-.SH NAME
-.B SiSU
-\- Structured information, Serialized Units \- a document publishing system, sqlite dependency package
-.PP
-This is a dummy package to install the dependencies required by SiSU to populate an sqlite database
-.SH SYNOPSIS
-.B sisu
-.I \-d [instruction]
-[filename/wildcard if required]
-.PP
-.B sisu
-.I \-d  \-\-(sqlite|pg) \-\-[instruction]
-[filename/wildcard if required]
-.PP
-.\"%% Description
-.SH DESCRIPTION
-.B sisu_sqlite
-.I is part of SiSU (man sisu)
-sisu_sqlite is a dummy package to install dependencies needed for sisu to populate an sqlite database, documented in man sisu
-.\"%% Flags Database
-.SH databases
-.TP
-dbi \- database interface
-.B \-d
-set for
-.I sqlite
-.TP
-.B \-\-sqlite \-\-createall
-initial step, creates required relations (tables, indexes) in existing (sqlite) database (a database should be created manually and given the same name as working directory, as requested) (rb.dbi)
-.TP
-.B \-\-sqlite \-\-import \-v
-.I [filename/wildcard]
-imports data specified to (sqlite) db (rb.dbi)
-.TP
-.B \-\-sqlite \-\-update \-v
-.I [filename/wildcard]
-updates/imports specified data to (sqlite) db (rb.dbi)
-.TP
-.B \-\-sqlite \-\-remove \-v
-.I [filename/wildcard]
-removes specified data to (sqlite) db (rb.dbi)
-.TP
-.B \-\-sqlite \-\-dropall
-kills data" and drops (postgresql) db, tables & indexes
-.TP
-.B \-\-sqlite \-\-recreate
-kills data" and drops and rebuilds empty (postgresql) db, tables & indexes
-.RE
-.\"%% Further Information
-.SH FURTHER INFORMATION
-.PP
-For more information on
-.I SiSU
-see:
-.I <http://www.jus.uio.no/sisu>
-.PP
-or
-.I man sisu
-.SH AUTHOR
-Ralph Amissah
-.I <ralph@amissah.com>
-or
-.I <ralph.amissah@gmail.com>
-.SH SEE ALSO
-.BR sisu(1),
-.BR sisu(8),
-.BR sisu_postgresql(7),
-.BR sisu_vim(7)
diff --git a/debian/sisu-complete.manpages b/debian/sisu-complete.manpages
index 3c05679f..6f1507bd 100644
--- a/debian/sisu-complete.manpages
+++ b/debian/sisu-complete.manpages
@@ -1 +1 @@
-debian/man/man7/sisu_complete.7
+man/man7/sisu_complete.7
diff --git a/debian/sisu-doc.install b/debian/sisu-doc.install
new file mode 100644
index 00000000..5f331d41
--- /dev/null
+++ b/debian/sisu-doc.install
@@ -0,0 +1,2 @@
+data/doc/manuals_generated/sisu_manual usr/share/doc/sisu
+data/doc/manuals_generated/_sisu usr/share/doc/sisu
diff --git a/debian/sisu-pdf.manpages b/debian/sisu-pdf.manpages
index d84a5424..1a6ba991 100644
--- a/debian/sisu-pdf.manpages
+++ b/debian/sisu-pdf.manpages
@@ -1 +1 @@
-debian/man/man7/sisu_pdf.7
+man/man7/sisu_pdf.7
diff --git a/debian/sisu-postgresql.manpages b/debian/sisu-postgresql.manpages
index 570f11a8..d034325b 100644
--- a/debian/sisu-postgresql.manpages
+++ b/debian/sisu-postgresql.manpages
@@ -1 +1 @@
-debian/man/man7/sisu_postgresql.7
+man/man7/sisu_postgresql.7
diff --git a/debian/sisu-sqlite.manpages b/debian/sisu-sqlite.manpages
index 502b5b18..f44d0235 100644
--- a/debian/sisu-sqlite.manpages
+++ b/debian/sisu-sqlite.manpages
@@ -1 +1 @@
-debian/man/man7/sisu_sqlite.7
+man/man7/sisu_sqlite.7
diff --git a/debian/sisu.install b/debian/sisu.install
index bd77b984..d1c06273 100644
--- a/debian/sisu.install
+++ b/debian/sisu.install
@@ -1,6 +1,6 @@
 bin/ usr
 lib/sisu/ usr/lib/ruby/1.8
-lib/sisu/ usr/lib/ruby/1.9
+#lib/sisu/ usr/lib/ruby/1.9
 conf/sisu etc
 data/sisu usr/share
 data/doc/sisu usr/share/doc
diff --git a/debian/sisu.manpages b/debian/sisu.manpages
index 56e21ea1..44cb4029 100644
--- a/debian/sisu.manpages
+++ b/debian/sisu.manpages
@@ -1,5 +1,21 @@
 man/man1/sisu.1
-man/man1/sisu_webrick.1
+man/man1/sisu_commands.1
+man/man1/sisu_configuration.1
+man/man1/sisu_help.1
+man/man1/sisu_help_sources.1
+man/man1/sisu_markup.1
+man/man1/sisu_skin.1
 man/man1/sisu_termsheet.1
+man/man1/sisu_webrick.1
+#man/man7/sisu_complete.7
+#man/man7/sisu_pdf.7
+#man/man7/sisu_postgresql.7
+#man/man7/sisu_sqlite.7
 man/man7/sisu_vim.7
 man/man8/sisu.8
+man/man8/sisu_faq.8
+man/man8/sisu_howto.8
+man/man8/sisu_quickstart.8
+man/man8/sisu_remote.8
+man/man8/sisu_search.8
+man/man8/sisu_syntax_highlighting.8