Merge tag 'sisu_4.1.10' into debian/sid

SiSU 4.1.10

4 files changed, 44 insertions, 6 deletions

diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 677c85ee..81f7b84f 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -23,6 +23,35 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 4.1.10.orig.tar.xz (2013-08-08:31/4)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.10
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.10-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.10.orig.tar.xz
+  sisu_4.1.10.orig.tar.xz
+  sisu_4.1.10-1.dsc
+
+[merge 5.0.10 lib]
+* output structure by, add monolingual alternative for :filetype or :filename
+  * filename without language code, if document is in default language
+  * set a default language, 'en' or as specified
+  * set in rc file or from command line instruction
+    * command line e.g.
+      sisu -hv --monolingual --by-filename sisu_markup.sst
+      sisu -3v --monolingual --by-filetype sisu_manual.ssm
+    * sisurc.yml lingual: 'mono' | 'multi'
+      lingual: 'mono'
+  * note: output by :filetype is roughly equivalent to what monolingual output
+    by :language would be
+  * allow command line setting of default language using language code
+    --default-language='en' --default-lang-en if used together with
+    --monolingual and --by-filetype or --by-filename the selected default
+    language document will not have a language code in the output filename
+  * documentation
+
+* cgi helper script, sample search form
+  * single cgi form, (with different internal variables set for output types)
+  * monolingual output search form option
+
 %% 4.1.9.orig.tar.xz (2013-08-01:30/4)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.9
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.9-1
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index b442c4ed..2066428b 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -23,6 +23,15 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 5.0.10.orig.tar.xz (2013-08-08:31/4)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.10
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.10-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.10.orig.tar.xz
+  sisu_5.0.10.orig.tar.xz
+  sisu_5.0.10-1.dsc
+
+* output structure by, multilingual, monolingual filenames tweak
+
 %% 5.0.9.orig.tar.xz (2013-08-01:30/4)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.9
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.9-1
diff --git a/data/sisu/v4/v/version.yml b/data/sisu/v4/v/version.yml
index cb22fae8..44e115be 100644
--- a/data/sisu/v4/v/version.yml
+++ b/data/sisu/v4/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 4.1.9
-:date_stamp: 2013w30/4
-:date: "2013-08-01"
+:version: 4.1.10
+:date_stamp: 2013w31/4
+:date: "2013-08-08"
 :project: SiSU
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index 06f247e4..8d462b6a 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 5.0.9
-:date_stamp: 2013w30/4
-:date: "2013-08-01"
+:version: 5.0.10
+:date_stamp: 2013w31/4
+:date: "2013-08-08"
 :project: SiSU