Merge branch 'upstream' into debian/sid

1 files changed, 38 insertions, 7 deletions

diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index 1ab0c980..9b7a7c11 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -12,11 +12,41 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
-2.7.6.orig.tar.gz (2010-10-11:41/1)
+%% 2.7.7.orig.tar.gz (2010-10-17:41/7)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.7.orig.tar.gz
+  sisu_2.7.7.orig.tar.gz
+  sisu_2.7.7-1.dsc
+  sisu_2.7.7-1.diff.gz
+
+  [debian freeze, fix]
+
+  * numbered codeblocks, fix, where codeblock opens with code{#
+    (requested fix needed by debian-live:live-manual, Ben Armstrong, Mark
+     Schneider & Daniel Baumann)
+    * dal changes as required, flag markup request and number
+    * constants, provide vertical line symbol, use to separate numbered
+      codeblock from code
+    * texpdf substitute \vline for numbered codeblock line separator
+
+  * texpdf, first space following a bullet should be fixed width, fix
+    (used \enspace (0.5em))
+    (requested fix and suggested latex solution, Ben Armstrong)
+
+  * texpdf, bullet text, hanging indent, fix works for regular text (not
+    grouped text)
+    (requested fix, Ben Armstrong)
+
+  * texpdf, codeblocks do not permit empty lines, fix
+
+  * documentation related minor updates and fixes
+
+%% 2.7.6.orig.tar.gz (2010-10-11:41/1)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.6.orig.tar.gz
-  sisu_2.7.6.orig.tar.gz
-  sisu_2.7.6-1.dsc
-  sisu_2.7.6-1.diff.gz
+  7cd4c46fa3bcadd9bad5f009836e3f76ba33581f346c20baa750df849e132a4c 2746314 sisu_2.7.6.orig.tar.gz
+  f9805002b99b9c7784a2e20a8f7ded02516f6a268e361785d7a15b0bd92c1360 1196 sisu_2.7.6-1.dsc
+  fbe107cce73dd5a4c302f014aff43a101e1f7e69333786b4667d39c0af044772 288465 sisu_2.7.6-1.diff.gz
+
+  [debian freeze, fix]
 
   * texpdf, codeblocks, code-line continuation backslash dropped, fix
     (requested fix, Ben Armstrong)
@@ -113,7 +143,7 @@ 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)
+      (requested fix, Ben Armstrong)
     * a5, increase headheight (11pt from 8pt)
 
   * shared_metadata
@@ -354,6 +384,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)
     * dal_syntax, constants, introduce #{ monospace }# tag
     * monospace font for codeblocks and #{ monospace }# tag
     * vim syntax, recognize #{ monospace }# tag
@@ -527,8 +558,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2.orig.tar.gz
   * markup for *{emphasis}* configurable as being displayed as bold, italics or
     underscore, the default is that emphasis output is in bold so there is no
     change unless configured, either in sisurc.yml (default: emphasis: 'bold'),
-    or the markup source document header @make: :emphasis: 'bold' [requested]
-    (requested modification, Cory Doctorow)
+    or the markup source document header @make: :emphasis: 'bold'
+    (requested modification, Cory Doctorow (prefers asterisk to be italics))
 
   * plaintext, wrap width configurable between 20 to 200 characters, the
     default width being 78, configuration either in sisurc.yml (default: text_wrap: