Merge branch 'upstream' into debian/sid

4 files changed, 60 insertions, 10 deletions

diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index d204e9a2..f621f7be 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -12,6 +12,11 @@ Reverse Chronological:
 
 %% STABLE Branch
 
+%% 2.9.6.orig.tar.gz (2011-06-07:23/2) [see 3.0.12]
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.12-1
+
+  * help, s/Bul garian/Bulgarian/ (Closes: #619068)
+
 %% 2.9.5.orig.tar.gz (2011-05-17:20/2) [see 3.0.10]
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.10-1
 
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 1385aeb5..5af32fc2 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -13,12 +13,56 @@ Reverse Chronological:
 %% Development branch UNSTABLE
 v3 branch once stable will supersede & replace current stable v2 branch
 
+%% 3.0.12.orig.tar.gz (2011-06-09:23/4)
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.12-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.12.orig.tar.gz
+  sisu_3.0.12.orig.tar.gz
+  sisu_3.0.12-1.dsc
+  sisu_3.0.12-1.debian.tar.gz
+
+  * harvest
+    * correct paths to document manifests etc. for the possible output dir
+      structures
+    * produce authors and topics lists for the documents that are available,
+      according to availability in each language
+
+  * cgi generated sample search form
+    * use ruby 1.9.2 shebang/header (sisu-pgsql, sisu-sqlite) recent upload
+      of libdbi-ruby1.9.1 fixes bug reported as #596103 (against
+      libdbd-pg-ruby1.9.1), search forms (pgsql & sqlite) can now use ruby
+      1.9.2, so cgi headers changed back to #!/usr/bin/env ruby [however must
+      use ruby >=1.9.2] (from #!/usr/bin/ruby1.8) [see sisu-3.0.8 NOTE &
+      "sample search form" solution, (now superseded)]
+    * force utf-8 character encoding to avoid issues, fix
+      (incompatible character encodings: UTF-8 and US-ASCII)
+    * correction of a variable name, fix
+
+  * options
+    * restrict glob rule checks to when --glob (-G) or --find (-f) requested
+    * carry information on document language (from filename and or directory
+    * (additional test)
+
+  * sysenv, limit/prevent the creation of spurious output directories (based on
+    language subdirectories), revisit
+
+  * manifest, fix a full name
+
+  * html, index.html syslink, remove and remake syslink
+  * texpdf, index.html syslink, made similar
+
+  * param, remove unused class variable '@@symlnk'
+
+  * help
+    * --help language, provides list of available languages (ISO 639-1 code (as
+      varied by po4a) & name)
+    * s/Bul garian/Bulgarian/ (Closes: #619068)
+
 %% 3.0.11.orig.tar.gz (2011-05-29:21/7)
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.11-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.11.orig.tar.gz
-  sisu_3.0.11.orig.tar.gz
-  sisu_3.0.11-1.dsc
-  sisu_3.0.11-1.debian.tar.gz
+  b3ff82d967565a35f9693ad95812adcb850ac4f58f60f4cf9e5a9d613d886fcc 1940955 sisu_3.0.11.orig.tar.gz
+  69d15d75fbf3670b8609dd8d9ee65a10b2eddfbcddd9ee206cbc48cfde6eb899 1223 sisu_3.0.11-1.dsc
+  2a11d94922d6810b5a786d51a148cc955d8c676932b9341b8a30bf114cab4cee 288354 sisu_3.0.11-1.debian.tar.gz
 
   * sysenv, url webserver link (manifest) fix
 
@@ -150,7 +194,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.8.orig.tar.gz
     * 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
+  * NOTE: [libdbi-ruby1.9.1 fixed in unstable 2011-06-06, & for sisu-3.0.12]
+    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
diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml
index 85cdd471..562ae361 100644
--- a/data/sisu/v2/v/version.yml
+++ b/data/sisu/v2/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 2.9.4
-:date_stamp: 2011w19/7
-:date: "2011-05-15"
+:version: 2.9.6
+:date_stamp: 2011w23/2
+:date: "2011-06-07"
 :project: SiSU
diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml
index 1e3c4e22..a997c557 100644
--- a/data/sisu/v3/v/version.yml
+++ b/data/sisu/v3/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 3.0.11-beta-rb1.9.2p180
-:date_stamp: 2011w29/7
-:date: "2011-05-29"
+:version: 3.0.12-beta-rb1.9.2p180
+:date_stamp: 2011w23/4
+:date: "2011-06-09"
 :project: SiSU