Merge branch 'upstream' into debian/sid

3 files changed, 63 insertions, 6 deletions

diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index 1420cfe6..d892910d 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -12,6 +12,17 @@ Reverse Chronological:
 
 %% STABLE Branch
 
+%% 2.9.4.orig.tar.gz (2011-05-15:19/7) [see 3.0.9]
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.9-1
+
+  * bin/sisu2 introduced (to complement bin/sisu3), currently same as bin/sisu
+    (later switch bin/sisu to bin/sisu3; consider using update-alternatives)
+
+  * vim, cterm colorschemes, touch search color
+
+  * copyright file, softlink, make more visible in tarball and update
+    * sisu-mode.el assigned to FSF (GNU EMACS)
+
 %% 2.9.3.orig.tar.gz (2011-04-27:17/3) [see 3.0.8]
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.8-1
 
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 2fdc9575..682db1a9 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -13,12 +13,54 @@ Reverse Chronological:
 %% Development branch UNSTABLE
 v3 branch once stable will supersede & replace current stable v2 branch
 
+%% 3.0.9.orig.tar.gz (2011-05-17:20/2)
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.9-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.9.orig.tar.gz
+  sisu_3.0.9.orig.tar.gz
+  sisu_3.0.9-1.dsc
+  sisu_3.0.9-1.debian.tar.gz
+
+  * bin/sisu2 introduced (to complement bin/sisu3), currently same as bin/sisu
+    (later switch bin/sisu to bin/sisu3; consider using update-alternatives)
+
+  * vim, cterm colorschemes, touch search color
+
+  * copyright file, softlink, make more visible in tarball and update
+    * sisu-mode.el assigned to FSF (GNU EMACS)
+
+  * options, expand name of file for selected language directories
+    * only use for single file(name) available in multiple languages e.g.
+      sisu3 -hv en/free_culture.lawrence_lessig.sst es fr
+    * english assumed as default language, make default configurable later
+    * particularly useful for po4a
+
+  * sysenv
+    * output directory structure check, fix & start testing alternatives
+      sisurc.yml output_by: (language|filetype|filename)
+    * output paths restructured, to have dir, url rel(ative) & rcp (for rsync or scp)
+      * url paths to output files (requires setup in sisurc.yml)
+      * consolidated output paths, directory & url, affecting many files
+
+  * rsync of output must cope with alternative file structures
+
+  * scp, disable until looked at
+
+  * dal_expand_insertions, fix resulting urls for shortcut for sisu generated
+    document in same output directory
+
+  * cgi sample search form generated to provide different links depending on
+    output structure, now links only to manifest and html toc
+
+  * manifest, url path, fix
+
+  * po4a, re-enabled, numerous issues
+
 %% 3.0.8.orig.tar.gz (2011-05-05:18/4)
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.8-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.8.orig.tar.gz
-  sisu_3.0.8.orig.tar.gz
-  sisu_3.0.8-1.dsc
-  sisu_3.0.8-1.debian.tar.gz
+  87b595cc6e108e325d80e7ef78e58463ab3cdd0d7036fd943224114c8eb9b897 1936305 sisu_3.0.8.orig.tar.gz
+  d3114d3aeba230501c79ab478c30985438ad1bf4a5cde628cb82ab7717028623 286421 sisu_3.0.8-1.dsc
+  43bc0459adb7174f03b91c67efd10d053a39da07dd1319f26fd2928f80876d03 1216 sisu_3.0.8-1.debian.tar.gz
 
   * bin/sisu3 bin/sisu /bin/sisu_webrick bin/sisu_termsheet
     * improved ruby version check
diff --git a/data/doc/sisu/copyright b/data/doc/sisu/copyright
index 84e8f311..5974c3fc 100644
--- a/data/doc/sisu/copyright
+++ b/data/doc/sisu/copyright
@@ -1,8 +1,12 @@
 Author: Ralph Amissah <ralph@amissah.com>
-Download: http://www.jus.uio.no/sisu/
+Download: <http://www.sisudoc.org> <http://www.jus.uio.no/sisu/>
 
-Files: *
-Copyright: (C) 1997-2009, Ralph Amissah
+Files: SiSU *
+Copyright: (C) 1997-2011, Ralph Amissah
+License: GPL-3+
+Files: sisu-mode.el
+Copyright: (C) 1997-2011, Ambrose Kofi Laing, Ralph Amissah
+  assigned to FSF 2011-04-08 (GNU EMACS)
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by