Merge branch 'upstream' into debian/sid

6 files changed, 28 insertions, 10 deletions

diff --git a/CHANGELOG b/CHANGELOG
index a679c8c..28b3c98 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,11 +6,22 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
+%% sisu-markup-samples_2.0.5.orig.tar.gz (2010-07-15:28/4)
+http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.5.orig.tar.gz
+  sisu-markup-samples_2.0.5.orig.tar.gz
+  sisu-markup-samples_2.0.5-1.dsc
+  sisu-markup-samples_2.0.5-1.diff.gz
+
+  * Little Brother, use image by Richard Wilkinson (image 4 cropped),
+    (replacing previous image used based on original book cover)
+
+  * CONTENT, remove image based on original book cover
+
 %% sisu-markup-samples_2.0.4.orig.tar.gz (2010-06-27:25/7)
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.4.orig.tar.gz
-  sisu-markup-samples_2.0.4.orig.tar.gz
-  sisu-markup-samples_2.0.4-1.dsc
-  sisu-markup-samples_2.0.4-1.diff.gz
+  ca6001d7373ad324356d08c8d043f444363bd9a7fe5f71e9f74586c31cded21e 14056624 sisu-markup-samples_2.0.4.orig.tar.gz
+  c53958da961153775ecd4f4fbed658418d413187501520679ecda67e97994c2a 1241 sisu-markup-samples_2.0.4-1.dsc
+  c4af4bdc43c0694bebebf577f8c12724c15960a698113af50a0866a4afb56b04 5256 sisu-markup-samples_2.0.4-1.diff.gz
 
   * adds text Democratizing Innovation, Eric von Hippel
 
diff --git a/data/v1/samples/_sisu/image/little_brother_doctorow.png b/data/v1/samples/_sisu/image/little_brother_doctorow.png
index af106a1..66893a2 100644
--- a/data/v1/samples/_sisu/image/little_brother_doctorow.png
+++ b/data/v1/samples/_sisu/image/little_brother_doctorow.png
diff --git a/data/v2/samples/_sisu/image/content_doctorow.png b/data/v2/samples/_sisu/image/content_doctorow.png
deleted file mode 100644
index 31687c6..0000000
--- a/data/v2/samples/_sisu/image/content_doctorow.png
+++ /dev/null
diff --git a/data/v2/samples/_sisu/image/little_brother_doctorow.png b/data/v2/samples/_sisu/image/little_brother_doctorow.png
index af106a1..66893a2 100644
--- a/data/v2/samples/_sisu/image/little_brother_doctorow.png
+++ b/data/v2/samples/_sisu/image/little_brother_doctorow.png
diff --git a/data/v2/samples/_sisu/skin/doc/skin_content.rb b/data/v2/samples/_sisu/skin/doc/skin_content.rb
index 556ec0b..9ca3c0a 100644
--- a/data/v2/samples/_sisu/skin/doc/skin_content.rb
+++ b/data/v2/samples/_sisu/skin/doc/skin_content.rb
@@ -23,6 +23,9 @@ module SiSU_Viz
     def url_home
       'http://craphound.com/content'
     end
+    def url_author
+      'http://craphound.com'
+    end
     def url_txt                                                                      # text to go with url usually stripped url
       'craphound.com/content'
     end
@@ -52,7 +55,10 @@ module SiSU_Viz
       %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor=#{color_white}><a href="#{url_home}" target="_top">#{png_home}</a></td><td width="40%"><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#f1e8de"><font face="arial" size="2"><a href="toc.html" target="_top">&nbsp;This&nbsp;text&nbsp;sub-&nbsp;<br />&nbsp;Table&nbsp;of&nbsp;Contents&nbsp;</a></font>#{table_close}</center></td><td width="20%">&nbsp;#{table_close}}
     end
     def banner_band
-      %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor=#{color_white}><a href="#{url_home}" target="_top">#{png_home}</a>#{table_close}}
+      %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff">
+      <p class="tiny_left"><a href="#{url_home}/" target="_top">CONTENT</a></p>
+      <p class="tiny_left"><a href="#{url_author}/" target="_top">Cory Doctorow</a></p>
+      #{table_close}}
     end
     #% credits
     def credits_splash
diff --git a/data/v2/samples/little_brother.cory_doctorow.sst b/data/v2/samples/little_brother.cory_doctorow.sst
index 0227797..16d6607 100644
--- a/data/v2/samples/little_brother.cory_doctorow.sst
+++ b/data/v2/samples/little_brother.cory_doctorow.sst
@@ -10,11 +10,12 @@
 
 @rights:
  :copyright: Copyright (C) Cory Doctorow, 2008.
+ :illustrations: Richard Wilkinson, 2009
  :license: This book is distributed under a Creative Commons Attribution-NonCommercial-ShareAlike 3.0 license. That means:<br>You are free:<br> * to Share - to copy, distribute and transmit the work<br> * to Remix - to adapt the work<br> Under the following conditions:<br> * Attribution. You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).<br> * Noncommercial. You may not use this work for commercial purposes.<br> * Share Alike. If you alter, transform, or build upon this work, you may distribute the resulting work only under the same or similar license to this one.<br> * For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link http://craphound.com/littlebrother <br> * Any of the above conditions can be waived if you get my permission<br> More info here: http://creativecommons.org/licenses/by-nc-sa/3.0/ <br> See the end of this file for the complete legalese. [Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License]
 
 @classify:
  :subject: Novel
- :topic_register: SiSU:markup sample:book;book:novel:fiction:civil rights|counterculture|young adult|science fiction|computer hackers|terrorism
+ :topic_register: SiSU:markup sample:book;book:novel:fiction:civil rights|counterculture|young adult|science fiction|computer hackers|terrorism;democracy
  :type: fiction
  :loc: PZ7.D66237 Lit 2008
  :oclc: 176972381
@@ -6548,16 +6549,16 @@ Creative Commons may be contacted at http://creativecommons.org/.
 % <span xmlns:dc="http://purl.org/dc/elements/1.1/" href="http://purl.org/dc/dcmitype/Text" property="dc:title" rel="dc:type">
 % 	Little Brother
 % </span>
-%
+% 
 % by
-%
+% 
 % <a xmlns:cc="http://creativecommons.org/ns#" href="http://craphound.com/littlebrother" property="cc:attributionName" rel="cc:attributionURL">
 % 	Cory Doctorow
 % </a>
-%
+% 
 % is licensed under a
-%
+% 
 % <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/us/">
 % 	Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License
 % </a>.
-%
+%