Merge branch 'upstream' into debian/sid

3 files changed, 102 insertions, 7 deletions

diff --git a/data/doc/sisu/v1/CHANGELOG b/data/doc/sisu/v1/CHANGELOG
index 0ccbf3ba..32811cb1 100644
--- a/data/doc/sisu/v1/CHANGELOG
+++ b/data/doc/sisu/v1/CHANGELOG
@@ -10,7 +10,7 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
-%% 1.0.1.orig.tar.gz (2009-12-19:50/6)
+%% 1.0.1.orig.tar.gz (2010-02-08:06/1)
 http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.1.orig.tar.gz
   sisu_1.0.1.orig.tar.gz
   sisu_1.0.1-1.dsc
diff --git a/data/doc/sisu/v1/sisu_markup_samples/README b/data/doc/sisu/v1/sisu_markup_samples/README
new file mode 100644
index 00000000..6352a301
--- /dev/null
+++ b/data/doc/sisu/v1/sisu_markup_samples/README
@@ -0,0 +1,101 @@
+A few sample books prepared as sisu markup samples, output formats to be
+generated using SiSU are contained in a separate package sisu_markup_samples
+
+Online a few sample marked up documents, and their resulting outputs, can be
+found at:
+ <http://www.jus.uio.no/sisu>
+ <http://www.jus.uio.no/sisu/SiSU/examples.html>
+
+The package sisu contains fewer sample documents, that are published under the
+GPL or that are Debian Free Software Guideline license compatible, notably:
+
+  Text: Free as in Freedom - Richard Stallman's Crusade for Free Software
+    URL: <http://faifzilla.org/>
+  Author: Sam Williams
+  Copyright: Sam Williams 2002 
+  License: Permission is granted to copy, distribute and/or modify this
+    document under the terms of the GNU Free Document License, Version 1.1 or any
+    later version published by the Free Software Foundation; with the Invariant
+    Sections being no invariant sections, with the Front-Cover Texts being no
+    invariant sections, and with the Back-Cover Texts being no invariant sections
+    URL: <http://www.gnu.org/copyleft/fdl.html>
+
+sisu_markup_samples contains gpl content and additional material released under
+various licenses mostly different Creative Commons licences that do not permit
+inclusion in the Debian Project as they do not meet the DFSG for various
+reasons, most commonly in that they require the original substantive text me
+maintained and often that the works be used only non-commercially
+
+  Free as in Freedom - Richard Stallman's Crusade for Free Software, Sam Williams, [as above]
+
+  Text: Free Culture - How Big Media Uses Technology and the Law to Lock Down Culture and Control Creativity
+    URL: <http://www.free-culture.cc>
+  Author: Lawrence Lessig
+    URL: <http://www.lessig.org/>
+  Copyright: Lawrence Lessig, 2004
+  License:
+    URL: <http://creativecommons.org/licenses/by-nc/1.0/>
+  
+  Text: The Wealth of Networks - How Social Production Transforms Markets and Freedom
+    URL: <http://cyber.law.harvard.edu/wealth_of_networks/Main_Page>
+  Author: Yochai Benkler
+    URL: <http://www.benkler.org/>
+  Copyright: 2006 Yochai Benkler
+  License: 
+    URL: <http://creativecommons.org/licenses/by-nc-sa/2.5/>
+  
+  Text: Two Bits - The Cultural Significance of Free Software
+    URL: <http://twobits.net/>
+  Author: Christopher Kelty
+    URL: <http://kelty.org/>
+  Copyright: Duke University Press, 2008
+  License: 
+    URL: <http://creativecommons.org/licenses/by-nc-sa/3.0/>
+  
+  Text: Free For All - How Linux and the Free Software Movement Undercut the High Tech Titans
+    URL: <http://www.wayner.org/books/ffa>
+  Author: Peter Wayner
+    URL: <http://www.wayner.org>
+  Copyright: Peter Wayner, 2000
+  License: 
+    URL: <http://creativecommons.org/licenses/by-nc/1.0/>
+  
+  Text: The Cathederal and the Bazaar
+    URL: <http://www.catb.org/~esr/writings/cathedral-bazaar/cathedral-bazaar/>
+  Author: Eric Raymond
+    URL: <http://www.catb.org/~esr>
+  Copyright: Eric S Raymond, 2000 
+  License:  Open Publication License, v 2.0 
+    URL: 
+  
+  Text: Little Brother
+    URL: <http://craphound.com/littlebrother>
+  Author: Cory Doctorow
+    URL: <http://craphound.com>
+  Copyright: Cory Doctorow, 2008
+  License: 
+    URL: <http://creativecommons.org/licenses/by-nc-sa/3.0/>
+  
+  Text: Accelerando
+    URL: <http://www.accelerando.org/>
+  Author: Charles Stross
+    URL: <http://www.antipope.org/charlie/>
+  Copyright: Charles Stross, 2005
+  License: 
+    URL: <http://creativecommons.org/licenses/by-nc-nd/2.0/>
+  Note: The SiSU preparation (presentations) of Accelerando are done with the kind permission of the author Charles Stross
+  
+  Text: UN Contracts for International Sale of Goods
+  Author: UN, UNCITRAL
+    URL: <http://www.un.org/>
+  Copyright:
+  License:
+
+Most additional material contained in sisu_markup_samples were published under
+various Creative Commons licenses, check the rights section of each document
+for the copyright and license, or the COPYRIGHT file associated with the
+package for a listing of material and their associated licenses.
+
+A few document more markup samples can be found at
+  <http://www.jus.uio.no/sisu>
+  <http://www.jus.uio.no/sisu/SiSU/examples.html>
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/README b/data/doc/sisu/v1/sisu_markup_samples/samples/README
deleted file mode 100644
index ef602a54..00000000
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/README
+++ /dev/null
@@ -1,6 +0,0 @@
-A few document markup samples, note that more can be found at
-http://www.jus.uio.no/sisu
-http://www.jus.uio.no/sisu/SiSU/2
-
-"Free as in Freedom" on Richard Stallman by Sam Williams
-was published under the GNU Free Documentation License