Merge branch 'upstream' into debian/sid

4 files changed, 39 insertions, 21 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 5fbeca6a..d11d0b29 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,7 +9,7 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
-%% sisu_0.64.3.orig.tar.gz (2008-02-05:05/2)
+%% sisu_0.64.3.orig.tar.gz (2008-02-06:05/3)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.3.orig.tar.gz
   sisu_0.64.3.orig.tar.gz
   sisu_0.64.3-1.dsc
diff --git a/conf/sisu/version.yml b/conf/sisu/version.yml
index b2c05c28..7154dd4a 100644
--- a/conf/sisu/version.yml
+++ b/conf/sisu/version.yml
@@ -1,5 +1,5 @@
 --- 
 :version: 0.64.3
-:date_stamp: 2008w05/2
-:date: "2008-02-05"
+:date_stamp: 2008w05/3
+:date: "2008-02-06"
 :project: SiSU
diff --git a/data/doc/sisu/CHANGELOG b/data/doc/sisu/CHANGELOG
index 46a51879..d11d0b29 100644
--- a/data/doc/sisu/CHANGELOG
+++ b/data/doc/sisu/CHANGELOG
@@ -9,11 +9,29 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
+%% sisu_0.64.3.orig.tar.gz (2008-02-06:05/3)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.3.orig.tar.gz
+  sisu_0.64.3.orig.tar.gz
+  sisu_0.64.3-1.dsc
+  sisu_0.64.3-1.diff.gz
+
+  * db sql pgsql future development and testing on version postgresql 8.3
+
+  * encoding utf-8 some compatibility checks
+
+  * db sql, for updates use match criteria '=' instead of LIKE
+    (required for pgsql 8.3 with bigint)
+
+  * ruby 1.9 testing, however remains closed
+
+  [(side note) ramaze looks good, search form re-done (cgi search form
+  re-engineered)]
+
 %% sisu_0.64.2.orig.tar.gz (2008-01-19:02/6)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.2.orig.tar.gz
-  sisu_0.64.2.orig.tar.gz
-  sisu_0.64.2-1.dsc
-  sisu_0.64.2-1.diff.gz
+  4b0e97e4387c84ac4017128ef7718cf2 1485265 sisu_0.64.2.orig.tar.gz
+  7fec34740202920c7182d39eeb55b7dc 629 sisu_0.64.2-1.dsc
+  ee2fe7d3dd57a7d98f3689e8e6bd6e97 146200 sisu_0.64.2-1.diff.gz
 
   * Dir.mkdir [instead of ftools File.mkpath], ruby 1.9
 
diff --git a/data/doc/sisu/html/sisu.1.html b/data/doc/sisu/html/sisu.1.html
index 71f82af6..aee67590 100644
--- a/data/doc/sisu/html/sisu.1.html
+++ b/data/doc/sisu/html/sisu.1.html
@@ -1127,10 +1127,10 @@ is used there is neither decoration nor hyperlinking, code blocks are discussed
 <p>  <b>markup example:</b> 
 <p> 
 <p> <br>
-<pre>      [ tux.png ]
+<pre>     [ tux.png ]
   % various url linked images
-      [ tux.png ]
-      [ GnuDebianLinuxRubyBetterWay.png ]
+     [ tux.png ]
+     [ GnuDebianLinuxRubyBetterWay.png ]
   {~^ ruby_logo.png
 </pre>
 <p>  <b>resulting output:</b> 
@@ -3269,25 +3269,25 @@ Type: <i>information</i>
 <p>  DC Date issued: <i>2002-08-28</i>
 
 <p>  DC Date available: <i>2002-08-28</i> 
-<p>  DC Date modified: <i>2007-09-29</i> 
-<p>  DC Date: <i>2007-09-29</i>
+<p>  DC Date modified: <i>2008-02-05</i> 
+<p>  DC Date: <i>2008-02-05</i>
 
 <p>  <b>Version Information</b> 
-<p>  Sourcefile: <i>sisu._sst</i> 
+<p>  Sourcefile: <i>sisu.ssm.sst</i> 
 <p>  Filetype: <i>SiSU</i> text insert
 
 <p>0.58 
-<p>  Sourcefile Digest, MD5(sisu._sst)= <i>8aad6597f7572baae4f0ef75999e5b4f</i>
+<p>  Sourcefile Digest, MD5(sisu.ssm.sst)= <i>587397c3165a622e01a5c800d69d39a0</i>
 
 <p>  Skin_Digest: MD5(skin_sisu_manual.rb)= <i>072b2584bedea82ea8a416587b9fa244</i>
 
 <p>  <b>Generated</b> 
-<p>  Document (metaverse) last generated: <i>Fri</i> Oct 12 20:14:00
+<p>  Document (metaverse) last generated: <i>Tue</i> Feb 05 23:45:59
 
-<p>+0100 2007 
-<p>  Generated by: <i>SiSU</i> <i>0.61.0</i> of 2007w41/1 (2007-10-08) 
+<p>+0000 2008 
+<p>  Generated by: <i>SiSU</i> <i>0.64.3</i> of 2008w05/2 (2008-02-05) 
 <p>  Ruby version:
-<i>ruby</i> 1.8.6 (2007-06-07 patchlevel 36) &nbsp;[i486-linux] 
+<i>ruby</i> 1.8.6 (2007-09-24 patchlevel 111) &nbsp;[i486-linux] 
 <p> 
 <ol>
 <b>.</b><li>objects include: headings,
@@ -3403,15 +3403,15 @@ distributable are not freely changeable. </li><b>.</b><li>named index.html or mo
 </dt>
 <dd></dd>
 
-<dt>* Generated by: SiSU 0.61.0 of 2007w41/1 (2007-10-08) </dt>
+<dt>* Generated by: SiSU 0.64.3 of 2008w05/2 (2008-02-05) </dt>
 <dd></dd>
 
 <dt>* Ruby version: ruby
-1.8.6 (2007-06-07 patchlevel 36) [i486-linux] </dt>
+1.8.6 (2007-09-24 patchlevel 111) [i486-linux] </dt>
 <dd></dd>
 
-<dt>* Last Generated on: Fri Oct 12
-20:14:00 +0100 2007 </dt>
+<dt>* Last Generated on: Tue Feb
+05 23:45:59 +0000 2008 </dt>
 <dd></dd>
 
 <dt>* SiSU <a href='http://www.jus.uio.no/sisu'>http://www.jus.uio.no/sisu</a>