Merge branch 'upstream' into debian/sid

3 files changed, 135 insertions, 3 deletions

diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index c8693324..ccb0fc4f 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -12,6 +12,72 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
+%% 2.7.0.orig.tar.gz (2010-09-21:38/2)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.0.orig.tar.gz
+  sisu_2.7.0.orig.tar.gz
+  sisu_2.7.0-1.dsc
+  sisu_2.7.0-1.diff.gz
+
+  Debian Squeeze equivalent (2.6.3-6 ported upstream)
+
+    [2.6.3-2 (2010-07-29:29/4)]
+    [debian dependency fixes (pre-freeze)]
+
+  * debian/control, sisu-pdf, Depends on texlive-xetex added (Closes: #590766),
+    replacing Recommends
+
+  * debian/control, sisu-pdf, Depends on lmodern added (Closes: #590767)
+
+    [2.6.3-3 (2010-08-22:33/7)]
+    [debian in freeze for squeeze, the only changes are documentation related]
+
+  * minor cleaning of headers (& a fix in book index) in document markup sample
+    free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
+
+  * update of some links
+    free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
+    list.yml promo.yml
+
+  * debian document markup samples, add copyright and license information
+
+    [2.6.3-4 (2010-08-31:35/2)]
+    [debian freeze, code and documentation fixes]
+
+  * html_format, xml_format, reduce visibility of sisu in output
+
+  * yml metadata, add subheading for a title
+
+  * html headers do not include the "title" field, fix (Closes: #594949)
+    (param, variable not set (presumably since change from v1 to v2))
+
+    [2.6.3-5 (2010-09-13:37/1)]
+    [debian freeze, code fixes]
+
+  * epub, fix xhtml line-break in rights metadata, results in unreadable epub
+    (Closes: #596736) epub output not readable by all epub-reader software (else
+    epub output can be viewed in calibre, but not in fbreader or okular)
+
+  * options, add expressive options --[name] as alternative to flags -[x]
+
+    [2.6.3-6 (2010-09-20:38/1)]
+    [debian freeze, documentation, minor fixes]
+
+  * html, v2 update (including --long-options) (manpage sync adds files)
+
+  * manpage, v2 update (including --long-options)
+
+  * sisu_commands.sst v2 update (including --long-options)
+
+  * help, minor update, revisit (includes minor fixes)
+
+  * identify markup, update ... revisit
+
+  * urls, sysenv, set manpage viewer to "man"
+
+  * options, bullet proof matches for --long-options  (effects minor fix)
+    fixes issue noted with --sample-search-form (-F) (in the selection of
+    webrick (--webserv-webrick))
+
 %% 2.6.3.orig.tar.gz (2010-07-28:30/3)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz
   cd9b24e386a6b47920aca0e7dce60b46e5fd2adf199ac9f33bb83cf10e6bfd2c 2733908 sisu_2.6.3.orig.tar.gz
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index 1919e62a..530eeb5a 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,6 +12,72 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
+%% 2.7.0.orig.tar.gz (2010-09-21:38/2)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.0.orig.tar.gz
+  sisu_2.7.0.orig.tar.gz
+  sisu_2.7.0-1.dsc
+  sisu_2.7.0-1.diff.gz
+
+  Debian Squeeze equivalent (2.6.3-6 ported upstream)
+
+    [2.6.3-2 (2010-07-29:29/4)]
+    [debian dependency fixes (pre-freeze)]
+
+  * debian/control, sisu-pdf, Depends on texlive-xetex added (Closes: #590766),
+    replacing Recommends
+
+  * debian/control, sisu-pdf, Depends on lmodern added (Closes: #590767)
+
+    [2.6.3-3 (2010-08-22:33/7)]
+    [debian in freeze for squeeze, the only changes are documentation related]
+
+  * minor cleaning of headers (& a fix in book index) in document markup sample
+    free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
+
+  * update of some links
+    free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
+    list.yml promo.yml
+
+  * debian document markup samples, add copyright and license information
+
+    [2.6.3-4 (2010-08-31:35/2)]
+    [debian freeze, code and documentation fixes]
+
+  * html_format, xml_format, reduce visibility of sisu in output
+
+  * yml metadata, add subheading for a title
+
+  * html headers do not include the "title" field, fix (Closes: #594949)
+    (param, variable not set (presumably since change from v1 to v2))
+
+    [2.6.3-5 (2010-09-13:37/1)]
+    [debian freeze, code fixes]
+
+  * epub, fix xhtml line-break in rights metadata, results in unreadable epub
+    (Closes: #596736) epub output not readable by all epub-reader software (else
+    epub output can be viewed in calibre, but not in fbreader or okular)
+
+  * options, add expressive options --[name] as alternative to flags -[x]
+
+    [2.6.3-6 (2010-09-20:38/1)]
+    [debian freeze, documentation, minor fixes]
+
+  * html, v2 update (including --long-options) (manpage sync adds files)
+
+  * manpage, v2 update (including --long-options)
+
+  * sisu_commands.sst v2 update (including --long-options)
+
+  * help, minor update, revisit (includes minor fixes)
+
+  * identify markup, update ... revisit
+
+  * urls, sysenv, set manpage viewer to "man"
+
+  * options, bullet proof matches for --long-options  (effects minor fix)
+    fixes issue noted with --sample-search-form (-F) (in the selection of
+    webrick (--webserv-webrick))
+
 %% 2.6.3.orig.tar.gz (2010-07-28:30/3)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz
   cd9b24e386a6b47920aca0e7dce60b46e5fd2adf199ac9f33bb83cf10e6bfd2c 2733908 sisu_2.6.3.orig.tar.gz
diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml
index 08bbe3bb..e26e2b18 100644
--- a/data/sisu/v2/v/version.yml
+++ b/data/sisu/v2/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 2.6.3
-:date_stamp: 2010w30/3
-:date: "2010-07-28"
+:version: 2.7.0
+:date_stamp: 2010w38/2
+:date: "2010-09-21"
 :project: SiSU