Merge tag 'sisu_4.0.4' into debian/sid

4 files changed, 37 insertions, 15 deletions

diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index eb13e699..53028424 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -29,12 +29,23 @@ v1 branch is removed; it is available in sisu =< 2.7
 
 %% Reverse Chronological:
 
+%% 3.3.7.orig.tar.xz (2013-01-31:04/4)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.7
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.7.orig.tar.xz
+  sisu_3.3.7.orig.tar.xz
+  sisu_3.3.7-1.dsc
+
+* v3: dal, on ocn excluded paragraphs (~# -#), hang/indent bullet, fix
+  [bug reported indirectly by Cory Doctorow (discovered in work with markup)]
+
+* v3: dal (obj), html, br_page* behavior in html depending on origin of break
+  (markup specified v auto)
+
 %% 3.3.6.orig.tar.xz (2013-01-27:03/7)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.6
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.6.orig.tar.xz
   sisu_3.3.6.orig.tar.xz
   sisu_3.3.6-1.dsc
-  sisu_3.3.6-1.debian.tar.gz
 
 * v3: epub some fixing, more documents render in more readers/viewers
   * ncx fix, navpoint_close
@@ -50,7 +61,6 @@ http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.5.orig.tar.xz
   sisu_3.3.5.orig.tar.xz
   sisu_3.3.5-1.dsc
-  sisu_3.3.5-1.debian.tar.gz
 
 * v3: epub
   * remove unnecessary conversion of some utf-8 characters to xhtml
@@ -76,7 +86,6 @@ http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.4.orig.tar.xz
   sisu_3.3.4.orig.tar.xz
   sisu_3.3.4-1.dsc
-  sisu_3.3.4-1.debian.tar.gz
 
 * v3: html_segments (by_filename by_filetype) internal document links do not
   work filenames need to include lang code, fixed
@@ -98,7 +107,6 @@ http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.3.orig.tar.xz
   sisu_3.3.3.orig.tar.xz
   sisu_3.3.3-1.dsc
-  sisu_3.3.3-1.debian.tar.gz
 
 * v3: cosmetic, code
   * true ? x : y
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 9d62e553..c5981d88 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -17,16 +17,33 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 4.0.4.orig.tar.xz (2013-01-31:04/4)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.4
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.4-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.4.orig.tar.xz
+  sisu_4.0.4.orig.tar.xz
+  sisu_4.0.4-1.dsc
+
+* v4: param_make, :cover_image: regex, less finicky match of image & details
+  [bug reported by Mikael Böök]
+
+* v4: dal, on ocn excluded paragraphs (~# -#), hang/indent bullet, fix
+  [bug reported indirectly by Cory Doctorow (discovered in work with markup)]
+
+* v4: epub, constants, debug alternative for various readers ... work on
+
+* v4: dal (obj), html, br_page* behavior in html depending on origin of break
+  (markup specified v auto)
+
 %% 4.0.3.orig.tar.xz (2013-01-27:03/7)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.3
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.3-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.3.orig.tar.xz
   sisu_4.0.3.orig.tar.xz
   sisu_4.0.3-1.dsc
-  sisu_4.0.3-1.debian.tar.gz
 
 * v4: epub some fixing, more documents render in more readers/viewers
-  * ncx fix, navpoint_close
+  * ncx fix, navpoint_close [bug reported by Mikael Böök, with sample fix toc]
   * check xml representation of characters (& < > in particular)
 
 * v4: remove markup-sample of the first edition of FaiF as redundant, the
@@ -41,7 +58,6 @@ http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian
 http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.2.orig.tar.xz
   sisu_4.0.2.orig.tar.xz
   sisu_4.0.2-1.dsc
-  sisu_4.0.2-1.debian.tar.gz
 
 * v4: epub
   * remove unnecessary conversion of some utf-8 characters to xhtml
@@ -70,7 +86,6 @@ http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian
 http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.1.orig.tar.xz
   sisu_4.0.1.orig.tar.xz
   sisu_4.0.1-1.dsc
-  sisu_4.0.1-1.debian.tar.gz
 
 * v4: html_segments (by_filename by_filetype) internal document links do not
   work filenames need to include lang code, fixed
@@ -112,7 +127,6 @@ http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian
 http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.0.orig.tar.xz
   sisu_4.0.0.orig.tar.xz
   sisu_4.0.0-1.dsc
-  sisu_4.0.0-1.debian.tar.gz
 
 * v4: bin/sisu $0 make possible to run sisu command on/within project dir tree
   (previously sisu needed to be correctly installed with system paths honored)
diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml
index 01e99d69..133bc6bb 100644
--- a/data/sisu/v3/v/version.yml
+++ b/data/sisu/v3/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 3.3.6
-:date_stamp: 2013w03/7
-:date: "2013-01-27"
+:version: 3.3.7
+:date_stamp: 2013w04/4
+:date: "2013-01-31"
 :project: SiSU
diff --git a/data/sisu/v4/v/version.yml b/data/sisu/v4/v/version.yml
index 2ab4818f..7707ce69 100644
--- a/data/sisu/v4/v/version.yml
+++ b/data/sisu/v4/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 4.0.3
-:date_stamp: 2013w03/7
-:date: "2013-01-27"
+:version: 4.0.4
+:date_stamp: 2013w04/4
+:date: "2013-01-31"
 :project: SiSU