Merge branch 'upstream' into debian/sid

2 files changed, 133 insertions, 3 deletions

diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index dc024147..1420cfe6 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -12,6 +12,55 @@ Reverse Chronological:
 
 %% STABLE Branch
 
+%% 2.9.3.orig.tar.gz (2011-04-27:17/3) [see 3.0.8]
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.8-1
+
+  * bin/sisu3 bin/sisu /bin/sisu_webrick bin/sisu_termsheet
+    * improved ruby version check
+
+  * vim
+    * sisu syntax change of a couple of color groups (Delimiter instead of
+      Include)
+    * 8 color cterm colorschemes
+      * sparse series uses dark grey on black, usually looks better, but only
+        works with a fixed color cursor, preferred in terms where you can get
+        away with using it
+      * frugal series avoids dark grey
+      * slate for cterm now incorporates frugal-cterm-sisu
+      * *-cterm-ruby & *-cterm-sisu colors adjusted where other color groupings are
+        preferred for programming / sisu markup
+
+  * sysenv, lowriter (instead of oowriter)
+
+  * manpage, reinstate escape of hyphens (clearly preferred, else lintian
+    reports hyphen-used-as-minus-sign)
+
+  * NOTE: generated cgi sample search form caught by Ruby/DBI libdbi-ruby1.9.1
+    reported as libdbd-pg-ruby1.9.1 bug #596103, where "select_all fails". The
+    cgi sample search scripts for postgresql and sqlite3 are almost identical,
+    both work in ruby 1.8.7, both have the same error in ruby 1.9.2... a very
+    similar bug is reported about the mysql library. Should #596103 and the
+    upstream report be reported against Ruby/DBI (libdbi-ruby1.9.1) rather than
+    libdbd-pg-ruby1.9.1?
+    * <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=596103>
+    * <http://rubyforge.org/tracker/index.php?func=detail&aid=28624&group_id=234&atid=967>
+    * <http://rubyforge.org/forum/forum.php?set=custom&forum_id=958&style=nested&max_rows=25&submit=Change+View>
+    fix/workaround options include:
+    * await bugfix, (bug has existed at least since 2010-09)
+    * rewrite for ruby-dbi using other constructs
+      e.g. s.fetch {|row| ...}
+    * revert to ruby 1.8.7 for the cgi script (they work independently of the
+      rest of the program anyway)
+    * rewrite for individual database dbi re: psql  and sqlite3
+    * await rdbi (ruby-dbi replacement), also needs to be packaged for Debian
+      <rdbi https://github.com/RDBI/rdbi>
+      <http://rdbi.hollensbe.org/>
+      <http://rdbi.hollensbe.org/files/README_rdoc.html>
+      and develop for that
+    or some meaningful combination of any of the above.
+
+  * vim colors colorscheme sparse-* frugal-* Slate minor changes
+
 %% 2.9.2.orig.tar.gz (2011-04-20:16/3) [see 3.0.7]
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.7-1
 
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index d69759ef..2fdc9575 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -13,12 +13,93 @@ Reverse Chronological:
 %% Development branch UNSTABLE
 v3 branch once stable will supersede & replace current stable v2 branch
 
+%% 3.0.8.orig.tar.gz (2011-05-05:18/4)
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.8-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.8.orig.tar.gz
+  sisu_3.0.8.orig.tar.gz
+  sisu_3.0.8-1.dsc
+  sisu_3.0.8-1.debian.tar.gz
+
+  * bin/sisu3 bin/sisu /bin/sisu_webrick bin/sisu_termsheet
+    * improved ruby version check
+
+  * options, language setting, based on directory structure or filename
+    * sysenv, language setting from options
+    * affects multiple libraries
+
+  * i18n, sysenv, options, language setting changes affecting many files
+    * must be able to set language at options stage from filename or directory
+
+  * prog_text_translation, renamed from what was i18n, i18n name reused
+
+  * db, directory structure changed, database prefix renamed
+    * language_document_char field made larger
+      [consider renaming language_document_code or ..._id]
+    * title, src_filename and language_document_char fields mandatory
+      (title, title_main, src_filename, language_document_char)
+
+  * NOTE: cgi sample search form caught by Ruby/DBI libdbi-ruby1.9.1 reported
+    reported as libdbd-pg-ruby1.9.1 bug #596103, where "select_all fails". The
+    cgi sample search scripts for postgresql and sqlite3 are almost identical,
+    both work in ruby 1.8.7, both have the same error in ruby 1.9.2... a very
+    similar bug is reported about the mysql library. Should #596103 and the
+    upstream report be reported against Ruby/DBI (libdbi-ruby1.9.1) rather than
+    libdbd-pg-ruby1.9.1?
+    * <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=596103>
+    * <http://rubyforge.org/tracker/index.php?func=detail&aid=28624&group_id=234&atid=967>
+    * <http://rubyforge.org/forum/forum.php?set=custom&forum_id=958&style=nested&max_rows=25&submit=Change+View>
+    fix/workaround options include:
+    * await bugfix, (bug has existed at least since 2010-09)
+    * rewrite for ruby-dbi using other constructs
+      e.g. s.fetch {|row| ...}
+    * revert to ruby 1.8.7 for the cgi script (they work independently of the
+      rest of the program anyway)
+    * rewrite for individual database dbi re: psql  and sqlite3
+    * await rdbi (ruby-dbi replacement), also needs to be packaged for Debian
+      <rdbi https://github.com/RDBI/rdbi>
+      <http://rdbi.hollensbe.org/>
+      <http://rdbi.hollensbe.org/files/README_rdoc.html>
+      and develop for that
+    * use some other programming language for sample search form
+      or some meaningful combination of any of the above.
+
+  * sample search form, revert to generating ruby 1.8.7 sample
+    * sisu3 using ruby >=1.9.2p180 generates search form for ruby 1.8.7, so:
+      generate sample form using sisu3 -F (options), then; start webrick using
+      ruby 1.8.7 & sisu -W (not sisu3)
+    * take account of alternative output directory structures [work on, test]
+
+  * manpage, reinstate escape of hyphens (clearly preferred, else lintian
+    reports hyphen-used-as-minus-sign)
+
+  * manpages, escaped hyphens reinstated (remove lintian info)
+
+  * urls, a fix, sqlite
+
+  * sysenv, lowriter (instead of libreoffice)
+
+  * db_select, ansi screen reporting, correction for sqlite db update
+
+  * concordance, output path, screen info correction
+
+  * vim
+    * sisu syntax change of a couple of color groups (Delimiter instead of
+      Include)
+    * 8 color cterm colorschemes
+      * sparse series uses dark grey on black, usually looks better, but only
+        works with a fixed color cursor, preferred in terms where you can get
+        away with using it
+      * frugal series avoids dark grey
+      * slate for cterm now incorporates frugal-cterm-sisu
+      * *-cterm-ruby & *-cterm-sisu colors adjusted where other color groupings are
+        preferred for programming / sisu markup
+
 %% 3.0.7.orig.tar.gz (2011-04-20:16/3)
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.7-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.7.orig.tar.gz
-  sisu_3.0.7.orig.tar.gz
-  sisu_3.0.7-1.dsc
-  sisu_3.0.7-1.debian.tar.gz
+  08474012bd979f4c18881be47d0b2e6c5add9a013b886ea6f7f943464db84825 1929419 sisu_3.0.7.orig.tar.gz
+  0028f57ed75fb1e358a0a14e197c607091d8a99c18b856750bd1d820c760ff6c 1216 sisu_3.0.7-1.dsc
+  9a9a9d139cc0f4c7ccdfcb41be7eaba517ce96914b68a483d08debd233c76929 285739 sisu_3.0.7-1.debian.tar.gz
 
   * param, md remove md.cmd and md.mod shortcut methods, use use md.opt
     (md.opt.cmd md.opt.mod)