Merge branch 'upstream' into debian/sid

10 files changed, 36 insertions, 10 deletions

diff --git a/CHANGELOG b/CHANGELOG
index f87443b..8d426bd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,11 +6,22 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
+%% sisu-markup-samples_2.0.2.orig.tar.gz (2010-04-27:17/2)
+http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.2.orig.tar.gz
+  sisu-markup-samples_2.0.2.orig.tar.gz
+  sisu-markup-samples_2.0.2-1.dsc
+  sisu-markup-samples_2.0.2-1.diff.gz
+
+  * oclc, a few online computer library center numbers of texts added (see
+    sisu-2.3.0 changelog)
+
+  * topic_register, minor tweaking for a few documents
+
 %% sisu-markup-samples_2.0.1.orig.tar.gz (2010-03-23:12/1)
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.1.orig.tar.gz
-  sisu-markup-samples_2.0.1.orig.tar.gz
-  sisu-markup-samples_2.0.1-1.dsc
-  sisu-markup-samples_2.0.1-1.diff.gz
+  21201eddcc9c6fff4f36eee4df6790042851cd855133519bc0b3b75729316825 13147092 sisu-markup-samples_2.0.1.orig.tar.gz
+  51d0d02d7ed05392ff81e6ebda687173e94e144d8c113b651a887854a8c30bae 1235 sisu-markup-samples_2.0.1-1.dsc
+  95ac5dcfad8d2548ee9534c544d62d6b32f25394ff552b9d3a5f826299ff0ff3 5109 sisu-markup-samples_2.0.1-1.diff.gz
 
   * adds text: CONTENT - Selected Essays on Technology, Creativity, Copyright
     and the Future of the Future, Cory Doctorow 
diff --git a/data/v2/samples/accelerando.charles_stross.sst b/data/v2/samples/accelerando.charles_stross.sst
index 0a9047b..c4ca72f 100644
--- a/data/v2/samples/accelerando.charles_stross.sst
+++ b/data/v2/samples/accelerando.charles_stross.sst
@@ -12,8 +12,10 @@
 
 @classify:
  :subject: Science Fiction
- :topic_register: SiSU:markup sample:book;book:novel:science fiction|short stories
+ :topic_register: SiSU:markup sample:book;book:novel:science fiction|short stories;fiction:science fiction|artificial intelligence
  :type: science fiction
+ :oclc: 57682282
+ :isbn: 9780441012848
 
 % @keywords:
 
diff --git a/data/v2/samples/content.cory_doctorow.sst b/data/v2/samples/content.cory_doctorow.sst
index 08708c6..5e94fb9 100644
--- a/data/v2/samples/content.cory_doctorow.sst
+++ b/data/v2/samples/content.cory_doctorow.sst
@@ -15,8 +15,9 @@
 
 @classify:
  :subject: Selected Essays
- :topic_register: SiSU:markup sample:book;copyright;content;creative commons;intellectual property:content;book:subject:culture|copyright|society|content;culture;society
- :type: fiction
+ :topic_register: SiSU:markup sample:book;copyright;content;creative commons;intellectual property:content;book:subject:culture|copyright|society|content|social aspects of technology;culture;society;technology:social aspects
+ :oclc: 268676051
+ :isbn: 9781892391810
 
 @make:
  :num_top: 1
diff --git a/data/v2/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst b/data/v2/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
index 78a383e..c3fba8b 100644
--- a/data/v2/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
+++ b/data/v2/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
@@ -11,6 +11,7 @@
 
 @classify:
  :topic_register: SiSU:markup sample:book;copyright;GNU/Linux:GPL|copyleft|free software;free software;Software:Software Libré;GPL;Linux:GNU|Software Libré;book:biography;programming
+ :oclc: 49044520
 
 @date:
  :published: 2002
diff --git a/data/v2/samples/free_culture.lawrence_lessig.sst b/data/v2/samples/free_culture.lawrence_lessig.sst
index 4e91803..49b407a 100644
--- a/data/v2/samples/free_culture.lawrence_lessig.sst
+++ b/data/v2/samples/free_culture.lawrence_lessig.sst
@@ -19,7 +19,9 @@
 
 @classify:
  :type: Book
- :topic_register: SiSU:markup sample:book;copyright;free culture;creative commons;intellectual property:copyright:creative commons;book:subject:culture|copyright|society;culture;society
+ :topic_register: SiSU:markup sample:book;copyright;free culture;creative commons;intellectual property:copyright:creative commons;book:subject:culture|copyright|society|public policy|mass media;culture;society
+ :isbn: 9781594200069
+ :oclc: 53324884
 
 % @date.created: 2004-04-08
 
diff --git a/data/v2/samples/free_for_all.peter_wayner.sst b/data/v2/samples/free_for_all.peter_wayner.sst
index c545616..e75e58b 100644
--- a/data/v2/samples/free_for_all.peter_wayner.sst
+++ b/data/v2/samples/free_for_all.peter_wayner.sst
@@ -8,6 +8,8 @@
 @classify:
  :type: Book
  :topic_register: SiSU:markup sample:book;GNU/Linux:GPL;free software;open source;software license:GPL;Linux:GNU|Software Libré;book:subject:Linux|Software Libré|technology
+ :oclc: 43520955
+ :isbn: 9780066620503
 
 @rights:
   :copyright: Copyright (C) Peter Wayner, 2000.
diff --git a/data/v2/samples/little_brother.cory_doctorow.sst b/data/v2/samples/little_brother.cory_doctorow.sst
index d8f73c7..9206b42 100644
--- a/data/v2/samples/little_brother.cory_doctorow.sst
+++ b/data/v2/samples/little_brother.cory_doctorow.sst
@@ -14,8 +14,11 @@
 
 @classify:
  :subject: Novel
- :topic_register: SiSU:markup sample:book;book:novel:fiction
+ :topic_register: SiSU:markup sample:book;book:novel:fiction:civil rights|counterculture|young adult|science fiction|computer hackers|terrorism
  :type: fiction
+ :loc: PZ7.D66237 Lit 2008
+ :oclc: 176972381
+ :isbn: 9780765319852
 
 @make:
  :breaks: break=1
diff --git a/data/v2/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst b/data/v2/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst
index 343be85..e5f37e9 100644
--- a/data/v2/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst
+++ b/data/v2/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst
@@ -18,6 +18,7 @@
  :issued: 1997-05-21
  :available: 1997-05-21
  :modified: 2002-08-02
+ :oclc: 45835582
 
 @links:
  {The Cathedral and the Bazaar @ SiSU }http://www.jus.uio.no/sisu/the_cathedral_and_the_bazaar.eric_s_raymond
diff --git a/data/v2/samples/the_wealth_of_networks.yochai_benkler.sst b/data/v2/samples/the_wealth_of_networks.yochai_benkler.sst
index 4a1e842..e6ff933 100644
--- a/data/v2/samples/the_wealth_of_networks.yochai_benkler.sst
+++ b/data/v2/samples/the_wealth_of_networks.yochai_benkler.sst
@@ -8,7 +8,9 @@
 
 @classify:
  :type: Book
- :topic_register: SiSU:markup sample:book;networks;Internet;intellectual property:patents|copyright;economics;society;copyright;patents;book:subject:economics|policy|society|copyright|patents
+ :topic_register: SiSU:markup sample:book;networks;Internet;intellectual property:patents|copyright;economics;society;copyright;patents;book:subject:information society|information networks|economics|public policy|society|copyright|patents
+ :isbn: 9780300110562
+ :oclc: 61881089
 
 @rights:
  :copyright: Copyright (C) 2006 Yochai Benkler.
diff --git a/data/v2/samples/two_bits.christopher_kelty.sst b/data/v2/samples/two_bits.christopher_kelty.sst
index 2698334..f1392ab 100644
--- a/data/v2/samples/two_bits.christopher_kelty.sst
+++ b/data/v2/samples/two_bits.christopher_kelty.sst
@@ -10,7 +10,8 @@
  :license: Licensed under the Creative Commons Attribution-NonCommercial-Share Alike License, available at http://creativecommons.org/licenses/by-nc-sa/3.0/ or by mail from Creative Commons, 559 Nathan Abbott Way, Stanford, Calif. 94305, U.S.A. "NonCommercial" as defined in this license specifically excludes any sale of this work or any portion thereof for money, even if sale does not result in a profit by the seller or if the sale is by a 501(c)(3) nonprofit or NGO.<br>Duke University Press gratefully acknowledges the support of HASTAC (Humanities, Arts, Science, and Technology Advanced Collaboratory), which provided funds to help support the electronic interface of this book.<br>Two Bits is accessible on the Web at twobits.net.
 
 @classify:
- :topic_register: software:development:geeks;anthropology:geeks;book:subject:anthropology|society|geeks;society;programming
+ :topic_register: open source software:social aspects;software:development:geeks;anthropology:geeks;book:subject:anthropology|information society|geeks;society;programming
+ :oclc: 183914703
 
 @date: 2008