From c18432935cfe80b071032182e51c0cf2049a6a91 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 22 Jun 2014 10:32:54 -0400
Subject: v5: version & changelog (& rakefile)

---
 data/doc/sisu/CHANGELOG_v5 | 7 +++++++
 data/sisu/v5/v/version.yml | 6 +++---
 rbuild                     | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 74dd197e..7cd63393 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -31,6 +31,13 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 5.4.2.orig.tar.xz (2014-06-22:24/7)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.4.2
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.4.2-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.2.orig.tar.xz
+  sisu_5.4.2.orig.tar.xz
+  sisu_5.4.2-1.dsc
+
 %% 5.4.1.orig.tar.xz (2014-06-19:24/4)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.4.1
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.4.1-1
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index ec9d1cde..a6fa41e7 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
 ---
 :project: SiSU
-:version: 5.4.1
-:date_stamp: 2014w24/4
-:date: "2014-06-19"
+:version: 5.4.2
+:date_stamp: 2014w24/7
+:date: "2014-06-22"
diff --git a/rbuild b/rbuild
index a5beb760..f9098868 100644
--- a/rbuild
+++ b/rbuild
@@ -37,7 +37,7 @@
 #require 'mkmf'
 #create_makefile("sisu")
 #% manual settings, edit/update as required (note current default settings are obtained from sisu version yml file)
-SiSU_version_next_stable     = '5.4.1'
+SiSU_version_next_stable     = '5.4.2'
 SiSU_version_next_unstable   = '6.0.8'
 #% rake file
 SiSU_version_generic_next_stable     = '5.4.x'
-- 
cgit v1.2.3


From 943cfb453046da6f6bb6753098166a6ec96b4c14 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 22 Jun 2014 10:36:10 -0400
Subject: ao, fix bug in previous version (5.4.1) from sloppy cherry pick of v6

* ao_doc_str (codeblock)
---
 data/doc/sisu/CHANGELOG_v5 | 3 +++
 lib/sisu/v5/ao_doc_str.rb  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 7cd63393..e3cab630 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -38,6 +38,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.2.orig.tar.xz
   sisu_5.4.2.orig.tar.xz
   sisu_5.4.2-1.dsc
 
+* ao, fix bug in previous version (5.4.1) from sloppy cherry pick of v6
+  ao_doc_str (codeblock)
+
 %% 5.4.1.orig.tar.xz (2014-06-19:24/4)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.4.1
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.4.1-1
diff --git a/lib/sisu/v5/ao_doc_str.rb b/lib/sisu/v5/ao_doc_str.rb
index 43fa8e5e..4708a126 100644
--- a/lib/sisu/v5/ao_doc_str.rb
+++ b/lib/sisu/v5/ao_doc_str.rb
@@ -425,8 +425,8 @@ module SiSU_AO_DocumentStructureExtract
             @@counter=1
             @codeblock_numbered=(t_o =~/^(?:code\{#|```[ ]+code\s[#])/) ? true : false
             @num_id[:code_block] +=1
-            h={  obj: '', sym: :code_block_open, num: @num_id[:code_block] }
-            t_o=SiSU_AO_DocumentStructure::ObjectLayout.new.open_close(h)
+            h={ obj: "group text start #{@num_id[:code_block]}" }
+            t_o=SiSU_AO_DocumentStructure::ObjectComment.new.comment(h)
           elsif t_o =~/^(?:poem\{|```[ ]+poem)/
             @@flag[:poem]=case t_o
             when /^poem\{/        then :curls
-- 
cgit v1.2.3