Merge branch 'upstream' into debian/sid

4 files changed, 56 insertions, 7 deletions

diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index d892910d..d204e9a2 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -12,6 +12,11 @@ Reverse Chronological:
 
 %% STABLE Branch
 
+%% 2.9.5.orig.tar.gz (2011-05-17:20/2) [see 3.0.10]
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.10-1
+
+  * copyright (minor) touch, dates for setup.rb
+
 %% 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
 
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 682db1a9..81381fc6 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -13,12 +13,56 @@ Reverse Chronological:
 %% Development branch UNSTABLE
 v3 branch once stable will supersede & replace current stable v2 branch
 
+%% 3.0.10.orig.tar.gz (2011-05-23:21/1)
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.10-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.10.orig.tar.gz
+  sisu_3.0.10.orig.tar.gz
+  sisu_3.0.10-1.dsc
+  sisu_3.0.10-1.debian.tar.gz
+
+  * copyright (minor) touch, dates for setup.rb
+
+  * sysenv, rsync, embedded
+    * rsync to remote host alternative output structures, fix
+      (remove blocking test path)
+    * get rid of annoying new nag to terminal (-v reporting
+      Dir.pwd), prevent attempt to change directory unless different directory
+      requested
+
+  * param, html, epub, xml, simplify file-naming convention with language code
+    (language code occurs in fixed location within file-name, could previously
+    be configured to occur in 1 of 3 locations within file-name)
+
+  * texpdf filenames
+
+  * i18n, add language name translation column to hash/table
+
+  * prog_text_translation:
+    * fix to Portuguese language class name (missed the 't')
+    * language name matching ('Portuguese Brazil')
+    * indentation
+
+  * options, include markup source "base" path, used to parse alternative
+    markup source dir structures
+
+  * manifest
+    * relative paths to "available outputs" (for each dir structure), fix
+    * show language versions published
+      (needs 2 runs of manifest, polls output as to whether manifest files exist)
+
+  * html
+    * close files
+    * syslink index.html to toc.html, needs revisit
+      (will only "work" properly with by_language directory structure)
+
+  * defaults, fix path to homepage image (more fixes remain ...)
+
 %% 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
+  90694ba44e6412f266fe0501975c3dcdc95824c5099f54729c436284f5948eab 1937861 sisu_3.0.9.orig.tar.gz
+  f33e08e31d9497f5ab09e0bc35753837671ac80690e8142f0690353a069ba65f 1216 sisu_3.0.9-1.dsc
+  5482748d75af890a00d9ecdb4302b31ed4508d9eb6f668ad9bd2f9428158bba3 287102 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)
diff --git a/data/doc/sisu/copyright b/data/doc/sisu/copyright
index 5974c3fc..9f84a32c 100644
--- a/data/doc/sisu/copyright
+++ b/data/doc/sisu/copyright
@@ -25,7 +25,7 @@ License: GPL-3+
  can be found in /usr/share/common-licenses/GPL-3 file.
 
 Files: setup.rb
-Copyright: Minero Aoki <http://i.loveruby.net/en/projects/setup/>
+Copyright: (C) 2000-2005 Minero Aoki <http://i.loveruby.net/en/projects/setup/>
 License: LGPL-2.1
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Library General Public
diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml
index e2f62d8c..e6c9bcaa 100644
--- a/data/sisu/v3/v/version.yml
+++ b/data/sisu/v3/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 3.0.9-beta-rb1.9.2p180
-:date_stamp: 2011w20/2
-:date: "2011-05-17"
+:version: 3.0.10-beta-rb1.9.2p180
+:date_stamp: 2011w21/1
+:date: "2011-05-23"
 :project: SiSU