Merge branch 'upstream' into debian/sid

2 files changed, 18 insertions, 18 deletions

diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
index f931b60c..69e51f28 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
@@ -18,9 +18,9 @@
 
 @date.available: 2007-08-28
 
-@date.modified: 2008-05-11
+@date.modified: 2008-05-22
 
-@date: 2008-05-11
+@date: 2008-05-22
 
 @level: new=C; break=1; num_top=1
 
@@ -55,7 +55,7 @@
 
 Download the latest version of SiSU (and SiSU markup samples):~{ Breakage and Fixes Report<br> http://www.jus.uio.no/sisu/SiSU/breakage_and_fixes.html }~
 
-_* {~^ sisu_0.66.3.orig.tar.gz (of 2008-03-30:12/7) }http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.3.orig.tar.gz
+_* {~^ sisu_0.67.0.orig.tar.gz (of 2008-05-22:20/4) }http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.0.orig.tar.gz
 
 _* {~^ sisu-markup-samples_1.0.8.orig.tar.gz (of 2007-08-19:33/7 ) }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_1.0.8.orig.tar.gz *~sisu-markup-samples
 
@@ -90,23 +90,23 @@ deb-src http://www.jus.uio.no/sisu/archive unstable main non-free
 
 !_ Source
 
-_* {~^ sisu_0.66.3.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.3.orig.tar.gz
+_* {~^ sisu_0.67.0.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.0.orig.tar.gz
 
-_* {~^ sisu_0.66.3-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.3-1.diff.gz
+_* {~^ sisu_0.67.0-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.0-1.diff.gz
 
-_* {~^ sisu_0.66.3-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.3-1.dsc
+_* {~^ sisu_0.67.0-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.0-1.dsc
 
 !_ Debs
 
-_* {~^ sisu_0.66.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.66.3-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
+_* {~^ sisu_0.67.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.67.0-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
 
-_* {~^ sisu-complete_0.66.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_0.66.3-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
+_* {~^ sisu-complete_0.67.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_0.67.0-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
 
-_* {~^ sisu-pdf_0.66.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_0.66.3-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
+_* {~^ sisu-pdf_0.67.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_0.67.0-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
 
-_* {~^ sisu-postgresql_0.66.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_0.66.3-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
+_* {~^ sisu-postgresql_0.67.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_0.67.0-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
 
-_* {~^ sisu-sqlite_0.66.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_0.66.3-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
+_* {~^ sisu-sqlite_0.67.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_0.67.0-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
 
 For changelogs see:
 
@@ -132,7 +132,7 @@ _1 http://www.jus.uio.no/sisu/sisu_markup_samples_changelog/changelog_markup_sam
 
 The RPM is generated Alien~{ http://www.kitenet.net/programs/alien/ }~ from two deb packages (sisu and sisu-doc). Dependencies are not handled, not even that of the essential Ruby.
 
-_* {~^ sisu-0.66.3-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-0.66.3-2.noarch.rpm ~{ untested, created using: alien -r sisu_0.66.3-1_all.deb }~
+_* {~^ sisu-0.67.0-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-0.67.0-2.noarch.rpm ~{ untested, created using: alien -r sisu_0.67.0-1_all.deb }~
 
 _* {~^ sisu-markup-samples_1.0.8.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_1.0.6.orig-2.noarch.rpm ~{ <br> untested, created using alien }~
 
diff --git a/man/man1/sisu.1 b/man/man1/sisu.1
index 19ad1649..59acec9f 100644
--- a/man/man1/sisu.1
+++ b/man/man1/sisu.1
@@ -1,4 +1,4 @@
-.TH "sisu" "1" "2008-05-22" "0.66.3" "SiSU"
+.TH "sisu" "1" "2008-05-22" "0.67.0" "SiSU"
 .SH NAME
 sisu \- documents: markup, structuring, publishing in multiple standard formats, and search
 .SH SYNOPSIS
@@ -4597,13 +4597,13 @@ Skin_Digest: MD5(skin_sisu_manual.rb)=
 
 .BR
 Document (metaverse) last generated:
-.I Thu May 22 20:03:01 \-0400 2008
+.I Thu May 22 21:53:23 \-0400 2008
 
 .BR
 Generated by:
 .I SiSU
-.I 0.66.3
-of 2008w18/0 (2008\-05\-11)
+.I 0.67.0
+of 2008w20/4 (2008\-05\-22)
 
 .BR
 Ruby version:
@@ -4758,10 +4758,10 @@ pdf: <http://www.jus.uio.no/sisu/sisu/landscape.pdf>
 at: <http://www.jus.uio.no/sisu>
 .TP
 .TP
-* Generated by: SiSU 0.66.3 of 2008w18/0 (2008-05-11)
+* Generated by: SiSU 0.67.0 of 2008w20/4 (2008-05-22)
 .TP
 * Ruby version: ruby 1.8.6 (2008-03-03 patchlevel 114) [i486-linux]
 .TP
-* Last Generated on: Thu May 22 20:03:01 -0400 2008
+* Last Generated on: Thu May 22 21:53:23 -0400 2008
 .TP
 * SiSU http://www.jus.uio.no/sisu