Merge branch 'upstream' into debian/sid

2 files changed, 64 insertions, 21 deletions

diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index 743786b4..1f522bbb 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,11 +12,54 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
+%% 2.7.9.orig.tar.gz (2010-12-09:49/4)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz
+  sisu_2.7.9.orig.tar.gz
+  sisu_2.7.9-1.dsc
+  sisu_2.7.9-1.diff.gz
+
+  [debian freeze, fix]
+
+  * dal, fix missing multi-line regex matches for line-wrap text
+    (live-manual, to work better with po4a)
+    * dal_doc_str, bulleted text (and headings), multi-line match, to permit
+      line-wrapped paragraphs
+      (requested fix, Ben Armstrong (live-manual))
+    * dal_syntax, multi-line match for fontface markup (emphasis, bold,
+      italics, underscore etc.)
+
+  * texpdf, use of monospace in headings causes table of contents breakage, fix
+    (requested fix, Ben Armstrong (live-manual))
+
+  * texpdf, toc now contains level 3~ to be consistent with other output
+    formats
+    (requested fix, Ben Armstrong (live-manual) "all TOC for different formats
+    include headings for 1~ 2~ and 3~ *except* PDF which only has 1~ and 2~. i
+    consider this a bug. how do i fix it?")
+    (the fix is a workaround manually indenting level 3 further than
+    level 2 as both levels make use of LaTeX "subsubsection")
+
+  * html & css, ocn (object numbers) now link to themselves, clicking on one
+    places that object at the top of the browser and provides its url
+    (requested, Ben Armstrong (live-manual))
+
+  * epub, ocn (object numbers) now link to themselves, clicking on one
+    places that object at the top of the viewer
+
+  * document manfest links
+    * html, link to "document manifest" remains (links to individual output
+      types removed)
+    * plaintext, link to "document manifest" fix(links to individual output
+      types removed)
+    * odf, manifest link fix
+
+  * html search form, configuration check
+
 %% 2.7.8.orig.tar.gz (2010-10-25:43/1)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz
-  sisu_2.7.8.orig.tar.gz
-  sisu_2.7.8-1.dsc
-  sisu_2.7.8-1.diff.gz
+  af9dac02064ea03c61d6eecd0882a9f1be6f83d37fdddcf8e45832b9def52140 2750397 sisu_2.7.8.orig.tar.gz
+  fcaada42eb8e449b620c2f529c642fdb44e0c0466b9d8ecd6e769cf07f986a3d 1196 sisu_2.7.8-1.dsc
+  e0fac804d4309740916666120acef61c1a82b4b7cabca04e979d4fc8b57db8c2 289790 sisu_2.7.8-1.diff.gz
 
   [debian freeze, fix]
 
@@ -35,21 +78,21 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz
 
   * internal links
     * dal, exclude parentheses and square brackets from matching
-      (requested fix, Ben Armstrong)
+      (requested fix, Ben Armstrong (live-manual))
     * html, remove space between link & following punctuation, parentheses &/or
       square brackets
-      (requested fix, Ben Armstrong)
+      (requested fix, Ben Armstrong (live-manual))
     * epub, remove space between link & following punctuation, parentheses &/or
       square brackets
 
   * html
     * remove "copy @" mark
-      (requested, Daniel Baumann)
+      (requested, Daniel Baumann (live-manual))
     * segments, title banner (including "copy @" mark) configurable, boolean,
       true/false (default false)
-      (requested off option, Daniel Baumann)
+      (requested off option, Daniel Baumann (live-manual))
     * quick ref links_guide configurable, boolean, true/false (default false)
-      (requested off option, Daniel Baumann)
+      (requested off option, Daniel Baumann (live-manual))
 
   * config.yml
     * html, seg title banner, boolean true/false setting (commented out,
@@ -67,7 +110,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.7.orig.tar.gz
 
   * numbered codeblocks, fix, where codeblock opens with code{#
     (requested fix needed by debian-live:live-manual, Ben Armstrong, Mark
-     Schneider & Daniel Baumann)
+     Schneider & Daniel Baumann (live-manual))
     * dal changes as required, flag markup request and number
     * constants, provide vertical line symbol, use to separate numbered
       codeblock from code
@@ -75,11 +118,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.7.orig.tar.gz
 
   * texpdf, first space following a bullet should be fixed width, fix
     (used \enspace (0.5em))
-    (requested fix and suggested latex solution, Ben Armstrong)
+    (requested fix and suggested latex solution, Ben Armstrong (live-manual))
 
   * texpdf, bullet text, hanging indent, fix works for regular text (not
     grouped text)
-    (requested fix, Ben Armstrong)
+    (requested fix, Ben Armstrong (live-manual))
 
   * texpdf, codeblocks do not permit empty lines, fix
 
@@ -94,7 +137,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.6.orig.tar.gz
   [debian freeze, fix]
 
   * texpdf, codeblocks, code-line continuation backslash dropped, fix
-    (requested fix, Ben Armstrong)
+    (requested fix, Ben Armstrong (live-manual))
 
   * shared_metadata, odf, url characters to not match
 
@@ -129,7 +172,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz
   [debian freeze, fix]
 
   * image scaling, requested fixes
-    (behaviour testing & request by Mark Schneider)
+    (behaviour testing & request by Mark Schneider (live-manual))
     * texpdf, scaling of images (below the set maximum size), fix
     * odf:odt, incorporation and scaling of images, fix
     * html (html_tune) scaling of images, fix
@@ -167,7 +210,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.2.orig.tar.gz
   [debian freeze, fix]
 
   * hub, test whether user name set, fix
-    (requested fix, provided by Ben Armstrong)
+    (requested fix, provided by Ben Armstrong (live-manual))
 
   * epub, fix breakage where angle brackets used in used metadata header
 
@@ -188,12 +231,12 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.1.orig.tar.gz
 
   * texpdf
     * provide line-break-points for long directory names
-      (requested fix, Ben Armstrong)
+      (requested fix, Ben Armstrong (live-manual))
     * a5, increase headheight (11pt from 8pt)
 
   * shared_metadata
     * odt, fix breakage where angle brackets used in metadata headers
-      (requested fix, Daniel Baumann)
+      (requested fix, Daniel Baumann (live-manual))
     * a typo fix
 
   * param, a few fixes (checks, aliases, typo)
@@ -279,7 +322,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz
   * html_format, epub_format: subtoc, footnote content bug (fix)
 
   * odf: lt (<), gt (>) fix for codeblocks; &amp fix, messy
-    (requested fix, Daniel Baumann)
+    (requested fix, Daniel Baumann (live-manual))
 
   * epub_format, removed some title & author info, check
 
@@ -429,7 +472,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.0.orig.tar.gz
     sisu-pdf, sisu-html, sisu-odf, sisu-epub, sisu-txt, sisu-pg, sisu-sqlite
 
   * monospace
-    (requested feature Daniel Baumann)
+    (requested feature Daniel Baumann (live-manual))
     * dal_syntax, constants, introduce #{ monospace }# tag
     * monospace font for codeblocks and #{ monospace }# tag
     * vim syntax, recognize #{ monospace }# tag
diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml
index 58135bb9..fe09b004 100644
--- a/data/sisu/v2/v/version.yml
+++ b/data/sisu/v2/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 2.7.8
-:date_stamp: 2010w43/1
-:date: "2010-10-25"
+:version: 2.7.9
+:date_stamp: 2010w49/4
+:date: "2010-12-09"
 :project: SiSU