Merge branch 'upstream' into debian/sid

1 files changed, 30 insertions, 17 deletions

diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index da409f26..156afe9f 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,11 +12,27 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
-%% 2.7.5.orig.tar.gz (2010-10-08:40/5)
+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
+
+  * texpdf, codeblocks, code-line continuation backslash dropped, fix
+    (requested fix, Ben Armstrong)
+
+  * shared_metadata, odf, url characters to not match
+
+  * sisu_convert, basic conversion script (seldom used/tested) start to get it
+    working again
+
+  * CHANGELOG v2 recount where some requests came from
+
+%% 2.7.5.orig.tar.gz (2010-10-09:40/6)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.5.orig.tar.gz
-  sisu_2.7.5.orig.tar.gz
-  sisu_2.7.5-1.dsc
-  sisu_2.7.5-1.diff.gz
+  616a17e5c238735a732a931b2fa203ac03395fcf6de9fa4c7df086d504eb716a 2745498 sisu_2.7.5.orig.tar.gz
+  79d6b9797641801e9ae755d0c8d0b9a446960d7325c77f633c484261f5fa7424 1196 sisu_2.7.5-1.dsc
+  4b3b551546f1d49ab275abd3ea9922a596fed71eea2c6ea891c6c46a182f8015 288646 sisu_2.7.5-1.diff.gz
 
   [debian freeze, fix]
 
@@ -37,17 +53,12 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz
 
   [debian freeze, fix]
 
-  * texpdf, scaling of images (below the set maximum size), fix
-    (requested fix)
-
-  * odf:odt, incorporation and scaling of images, fix
-    (requested fix)
-
-  * html (html_tune) scaling of images, fix
-    (requested fix)
-
-  * epub (epub_tune) scaling of images, fix
-    (requested fix)
+  * image scaling, requested fixes
+    (behaviour testing & request by Mark Schneider)
+    * 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
+    * epub (epub_tune) scaling of images, fix
 
 %% 2.7.3.orig.tar.gz (2010-10-06:40/3)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.3.orig.tar.gz
@@ -81,7 +92,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)
+    (requested fix, provided by Ben Armstrong)
 
   * epub, fix breakage where angle brackets used in used metadata header
 
@@ -107,7 +118,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.1.orig.tar.gz
 
   * shared_metadata
     * odt, fix breakage where angle brackets used in metadata headers
-      (requested fix)
+      (requested fix, Daniel Baumann)
     * a typo fix
 
   * param, a few fixes (checks, aliases, typo)
@@ -193,6 +204,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)
 
   * epub_format, removed some title & author info, check
 
@@ -516,6 +528,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2.orig.tar.gz
     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)
 
   * plaintext, wrap width configurable between 20 to 200 characters, the
     default width being 78, configuration either in sisurc.yml (default: text_wrap: