Merge tag 'sisu_4.1.4' into debian/sid

SiSU 4.1.4

4 files changed, 42 insertions, 8 deletions

diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 0dcd5a39..bf4fd392 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -23,6 +23,23 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 4.1.4.orig.tar.xz (2013-06-06:22/4)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.4
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.4-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.4.orig.tar.xz
+  sisu_4.1.4.orig.tar.xz
+  sisu_4.1.4-1.dsc
+
+* db, population of database (--update), import of master files (.ssm), fix
+  (Note: for .ssm: @md.fns (is set during runtime & is) != @opt.fns @md.opt.fns,
+  affects construction of unique identifier)
+
+* cgi helper script, sample search form generator
+  * file name matching, check
+  * cosmetic, drop use of images in sample form
+
+* sysenv, requested load warning removed, less screen clutter, consider
+
 %% 4.1.3.orig.tar.xz (2013-05-30:21/4)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.3
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.3-1
@@ -32,7 +49,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.3.orig.tar.xz
 
 * sysenv, pgsql db connect fix
 
-* cgi_pgsql, cgi helper script sample search form generator, detail
+* cgi_pgsql, cgi helper script, sample search form generator, detail
 
 %% 4.1.2.orig.tar.xz (2013-05-29:21/3)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.2
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index b6b660c9..463de70e 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -23,6 +23,23 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 5.0.4.orig.tar.xz (2013-06-06:22/4)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.4
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.4-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.4.orig.tar.xz
+  sisu_5.0.4.orig.tar.xz
+  sisu_5.0.4-1.dsc
+
+* db, population of database (--update), import of master files (.ssm), fix
+  (Note: for .ssm: @md.fns (is set during runtime & is) != @opt.fns @md.opt.fns,
+  affects construction of unique identifier)
+
+* cgi helper script, sample search form generator
+  * file name matching, check
+  * cosmetic, drop use of images in sample form
+
+* sysenv, requested load warning removed, less screen clutter, consider
+
 %% 5.0.3.orig.tar.xz (2013-05-30:21/4)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.3
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.3-1
@@ -32,7 +49,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.3.orig.tar.xz
 
 * sysenv, pgsql db connect fix
 
-* cgi_pgsql, cgi helper script sample search form generator, detail
+* cgi_pgsql, cgi helper script, sample search form generator, detail
 
 %% 5.0.2.orig.tar.xz (2013-05-29:21/3)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.2
diff --git a/data/sisu/v4/v/version.yml b/data/sisu/v4/v/version.yml
index e7619f1b..a8779fb8 100644
--- a/data/sisu/v4/v/version.yml
+++ b/data/sisu/v4/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 4.1.3
-:date_stamp: 2013w21/4
-:date: "2013-05-30"
+:version: 4.1.4
+:date_stamp: 2013w22/4
+:date: "2013-06-06"
 :project: SiSU
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index 5b6e4fee..c1f74d80 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 5.0.3
-:date_stamp: 2013w21/4
-:date: "2013-05-30"
+:version: 5.0.4
+:date_stamp: 2013w22/4
+:date: "2013-06-06"
 :project: SiSU