Merge tag 'sisu_4.2.20' into debian/sid

SiSU 4.2.20

4 files changed, 39 insertions, 6 deletions

diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 26a3c700..c3a3cf80 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -5,6 +5,8 @@
   <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=blob_plain;f=debian/changelog;hb=refs/heads/debian/sid>
 v5 development branch
 v4 stable branch supersedes & replaces v3 branch
+   [v4 branch closure imminent, v5 to become stable, posted with 4.2.20,
+   2014-01-20]
    initial goals:
    * remove/retire "skins"; replace some functionality with headers and/or yml
      file (consider header like syntax for document and site appearance info)
@@ -23,6 +25,20 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 4.2.20.orig.tar.xz (2014-01-20:03/1)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.20
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.20-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.20.orig.tar.xz
+  sisu_4.2.20.orig.tar.xz
+  sisu_4.2.20-1.dsc
+
+[good time to consider rollover: closing v4 branch, replacing it with v5 &
+introducing v6 for development, proposed for this release + 1]
+
+* bin/sisu & some related lib changes
+
+* sysenv for texpdf, fix for when tex to pdf generator is absent
+
 %% 4.2.19.orig.tar.xz (2014-01-17:02/5)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.19
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.19-1
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 9cabec20..5eff6d0c 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -4,10 +4,13 @@
 * debian/changelog
   <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=blob_plain;f=debian/changelog;hb=refs/heads/debian/sid>
 v5 markup rule change, document structure rule introduced:
+   [v5 branch to become stable shortly, posted with 5.2.3, 2014-01-20]
    * single document root == document title == heading level A~
    * adds possible level D~
    (from 5.2 on (earlier v5 development branch insulated from v4))
 v4 stable branch supersedes & replaces v3 branch
+   [v4 branch closure imminent, v5 to become stable, posted with 4.2.20,
+   2014-01-20]
    initial goals:
    * remove/retire "skins"; replace some functionality with headers and/or yml
      file (consider header like syntax for document and site appearance info)
@@ -26,6 +29,20 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 5.2.3.orig.tar.xz (2014-01-20:03/1)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.2.3
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.2.3-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.2.3.orig.tar.xz
+  sisu_5.2.3.orig.tar.xz
+  sisu_5.2.3-1.dsc
+
+[good time to consider rollover: closing v4 branch, replacing it with v5 &
+introducing v6 for development, proposed for this release + 1]
+
+* bin/sisu & some related lib changes
+
+* sysenv for texpdf, fix for when tex to pdf generator is absent
+
 %% 5.2.2.orig.tar.xz (2014-01-17:02/5)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.2.2
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.2.2-1
diff --git a/data/sisu/v4/v/version.yml b/data/sisu/v4/v/version.yml
index faa3d64c..41bffc8e 100644
--- a/data/sisu/v4/v/version.yml
+++ b/data/sisu/v4/v/version.yml
@@ -1,5 +1,5 @@
 ---
 :project: SiSU
-:version: 4.2.19
-:date_stamp: 2014w02/5
-:date: "2014-01-17"
+:version: 4.2.20
+:date_stamp: 2014w03/1
+:date: "2014-01-20"
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index 073b83d3..de7e0305 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
 ---
 :project: SiSU
-:version: 5.2.2
-:date_stamp: 2014w02/5
-:date: "2014-01-17"
+:version: 5.2.3
+:date_stamp: 2014w03/1
+:date: "2014-01-20"