Merge branch 'upstream' into debian/sid

6 files changed, 19 insertions, 3 deletions

diff --git a/data/doc/sisu/v1/CHANGELOG b/data/doc/sisu/v1/CHANGELOG
index c81c90fd..7ee8a695 100644
--- a/data/doc/sisu/v1/CHANGELOG
+++ b/data/doc/sisu/v1/CHANGELOG
@@ -10,11 +10,22 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
+%% 1.0.3.orig.tar.gz (2010-02-17:07/3)
+http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.3.orig.tar.gz
+  sisu_1.0.3.orig.tar.gz
+  sisu_1.0.3-1.dsc
+  sisu_1.0.3-1.diff.gz
+
+  * plaintext, footnote / endnote fix, footnotes to occur immediately after
+    paragraph that contains them (unless endnotes are selected instead)
+
+  * document sample skins, utf-8 specified (in some cases needed by ruby 1.9.1)
+
 %% 1.0.2.orig.tar.gz (2010-02-10:06/3)
 http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.2.orig.tar.gz
-  sisu_1.0.2.orig.tar.gz
-  sisu_1.0.2-1.dsc
-  sisu_1.0.2-1.diff.gz
+  158f3eda47d22eb23ca9fb5e383ae57d366974e3e4c4dec2326021228413a66d 1556982 sisu_1.0.2.orig.tar.gz
+  3e32dd8d1dd75042d31897ef961907b52f5e72ca28a1a909ceb041f284b6c1de 1145 sisu_1.0.2-1.dsc
+  5e7349e1d51dad712eeab694fcb1237790156ffb51178edeecd4d0ec9e8fc91a 152552 sisu_1.0.2-1.diff.gz
 
   * Free as in Freedom (on RMS), Sam Williams, markup sample, markup variation,
     affects numbering
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_gnu.rb b/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_gnu.rb
index e998624b..8ac38227 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_gnu.rb
+++ b/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_gnu.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 =begin
  * Name: SiSU - Simple information Structuring Universe - Structured information, Serialized Units
  * Author: Ralph Amissah
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_gutenberg.rb b/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_gutenberg.rb
index 47d2d28f..305f5e61 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_gutenberg.rb
+++ b/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_gutenberg.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 =begin
  * Name: SiSU - Simple information Structuring Universe - Structured information, Serialized Units
  * Author: Ralph Amissah
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_kdissert.rb b/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_kdissert.rb
index d1f6a889..a7e08835 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_kdissert.rb
+++ b/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_kdissert.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 =begin
  * Name: SiSU - Simple information Structuring Universe - Structured information, Serialized Units
  * Author: Ralph Amissah
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_rms.rb b/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_rms.rb
index 95f936a8..0f3e7d34 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_rms.rb
+++ b/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_rms.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 =begin
  * Name: SiSU - Simple information Structuring Universe - Structured information, Serialized Units
  * Author: Ralph Amissah
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb
index 92ee2b34..954be971 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 =begin
  * Name: SiSU information Structuring Universe - Structured information, Serialized Units
  * Author: Ralph@Amissah.com