debian/copyright, update

* account for multiple instance of same content (with different markup)
* alphabetize by document title
* add single instances of War and Peace & Don Quixote, both public domain

1 files changed, 98 insertions, 88 deletions

diff --git a/debian/copyright b/debian/copyright
index 4125f07..83fb5dd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,41 +19,31 @@ Files: setup.rb
 Copyright: Minero Aoki <http://i.loveruby.net/en/projects/setup/>
 License: LGPL-2.1
 
-Files: data/samples/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst
-Copyright: 2002, Sam Williams
-           2010, Richard M. Stallman
-License: GFDL-NIV-1.3
- <http://www.gnu.org/copyleft/fdl.html>
-NOTES: Free as in Freedom 2.0 - Richard Stallman and the Free Software Revolution
- <http://shop.fsf.org/product/free-as-in-freedom-2/> by Sam Williams, 2nd ed.
- revisions by Richard M. Stallman
+Files: data/samples/**/accelerando.charles_stross.sst
+Copyright: 2005, Charles Stross
+License: CC-BY-NC-ND-2.0
+ Attribution-Noncommercial-No Derivative Works
+ <http://creativecommons.org/licenses/by-nc-nd/2.0/>
+ The SiSU preparation (presentations) of Accelerando are done with the kind
+ permission of the author Charles Stross
+NOTES: Accelerando <http://www.accelerando.org/>
+  by Charles Stross <http://www.antipope.org/charlie/>
 
-Files: data/samples/free_culture.lawrence_lessig.sst
-Copyright: 2004, Lawrence Lessig
-License: CC-BY-NC-1.0
- Attribution-Noncommercial
-NOTES: Free Culture - How Big Media Uses Technology and the Law to Lock Down
- Culture and Control Creativity
- <http://www.free-culture.cc> by Lawrence Lessig <http://www.lessig.org/>
+Files: data/samples/**/alices_adventures_in_wonderland.lewis_carroll.sst
+Copyright: 1865
+License: Public Domain
+NOTES: Alice's Adventures in Wonderland by Lewis Carroll
 
-Files: data/samples/the_wealth_of_networks.yochai_benkler.sst
-Copyright: 2006, Yochai Benkler
-License: CC-BY-NC-SA-2.5
+Files: data/samples/**/content.cory_doctorow.sst
+Copyright: 2008, Cory Doctorow
+License: CC-BY-NC-SA-3.0
  Attribution-Noncommercial-Share Alike
- <http://creativecommons.org/licenses/by-nc-sa/2.5/>
-NOTES: The Wealth of Networks - How Social Production Transforms Markets and
-  Freedom <http://cyber.law.harvard.edu/wealth_of_networks/Main_Page>
-  by Yochai Benkler <http://www.benkler.org/>
-
-Files: data/samples/viral_spiral.david_bollier.sst
-Copyright: 2008, David Bollier
-License: CC-BY-NC-3.0
- Attribution-Noncommercial
- <http://creativecommons.org/licenses/by-nc/3.0/>
-NOTES: Viral Spiral <http://viralspiral.cc/>
-  by David Bollier <http://www.bollier.org/>
+ <http://creativecommons.org/licenses/by-nc-sa/3.0/>
+NOTES: CONTENT - Selected Essays on Technology, Creativity, Copyright and the
+  Future of the Future
+  <http://craphound.com/content> by Cory Doctorow <http://craphound.com>
 
-Files: data/samples/democratizing_innovation.eric_von_hippel.sst
+Files: data/samples/**/democratizing_innovation.eric_von_hippel.sst
 Copyright: 2005, Eric von Hippel
 License: CC-BY-NC-ND-2.0
  Attribution-Noncommercial-No Derivative Works
@@ -61,16 +51,45 @@ License: CC-BY-NC-ND-2.0
 NOTES: Democratizing Innovation <http://web.mit.edu/evhippel/www/democ1.htm>
   by Eric von Hippel <http://web.mit.edu/evhippel/www/>
 
-Files: data/samples/two_bits.christopher_kelty.sst
-Copyright: 2008, Christopher Kelty
-           2008, Duke University Press
+Files: data/samples/minimal/don_quixote.miguel_de_cervates.sst
+Copyright: 1615
+License: Public Domain
+NOTES: Don Quixote by Miguel de Cervantes
+
+Files: data/samples/**/down_and_out_in_the_magic_kingdom.cory_doctorow.sst
+Copyright: 2003, Cory Doctorow
+License: CC-BY-NC-SA-1.0
+ Attribution-NonCommercial-ShareAlike
+ <http://creativecommons.org/licenses/by-nc-sa/1.0/>
+NOTES:  Down and Out in the Magic Kingdom <http://craphound.com/down>
+  by Cory Doctorow <http://craphound.com>
+
+Files: data/samples/**/for_the_win.cory_doctorow.sst
+Copyright: 2010, Cory Doctorow
 License: CC-BY-NC-SA-3.0
  Attribution-Noncommercial-Share Alike
  <http://creativecommons.org/licenses/by-nc-sa/3.0/>
-NOTES: Two Bits - The Cultural Significance of Free Software
-  <http://twobits.net/> by Christopher Kelty <http://kelty.org/>
+NOTES: For the Win <http://craphound.com/ftw>
+  by Cory Doctorow <http://craphound.com>
+
+Files: data/samples/**/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst
+Copyright: 2002, Sam Williams
+           2010, Richard M. Stallman
+License: GFDL-NIV-1.3
+ <http://www.gnu.org/copyleft/fdl.html>
+NOTES: Free as in Freedom 2.0 - Richard Stallman and the Free Software Revolution
+ <http://shop.fsf.org/product/free-as-in-freedom-2/> by Sam Williams, 2nd ed.
+ revisions by Richard M. Stallman
+
+Files: data/samples/**/free_culture.lawrence_lessig.sst
+Copyright: 2004, Lawrence Lessig
+License: CC-BY-NC-1.0
+ Attribution-Noncommercial
+NOTES: Free Culture - How Big Media Uses Technology and the Law to Lock Down
+ Culture and Control Creativity
+ <http://www.free-culture.cc> by Lawrence Lessig <http://www.lessig.org/>
 
-Files: data/samples/free_for_all.peter_wayner.sst
+Files: data/samples/**/free_for_all.peter_wayner.sst
 Copyright: 2000, Peter Wayner
 License: CC-BY-NC-1.0
  Attribution-Noncommercial
@@ -79,14 +98,27 @@ NOTES: Free For All - How Linux and the Free Software Movement Undercut the
   High Tech Titans
   <http://www.wayner.org/books/ffa> by Peter Wayner <http://www.wayner.org>
 
-Files: data/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst
+Files: data/samples/**/gullivers_travels.jonathan_swift.sst
+Copyright: 1726
+License: Public Domain
+NOTES: Gulliver's Travels by Jonathan Swift
+
+Files: data/samples/**/little_brother.cory_doctorow.sst
+Copyright: 2008, Cory Doctorow
+License: CC-BY-NC-SA-3.0
+ Attribution-Noncommercial-Share Alike
+ <http://creativecommons.org/licenses/by-nc-sa/3.0/>
+NOTES: Little Brother <http://craphound.com/littlebrother>
+  by Cory Doctorow <http://craphound.com>
+
+Files: data/samples/**/the_cathedral_and_the_bazaar.eric_s_raymond.sst
 Copyright: 2000, Eric S Raymond
 License: Open Publication License, v 2.0
 NOTES: The Cathederal and the Bazaar
   <http://www.catb.org/~esr/writings/cathedral-bazaar/cathedral-bazaar/>
   by Eric Raymond <http://www.catb.org/~esr>
 
-Files: data/samples/the_public_domain.james_boyle.sst
+Files: data/samples/**/the_public_domain.james_boyle.sst
 Copyright: 2008, James Boyle
 License: CC-BY-NC-SA-3.0
  Attribution-Noncommercial-Share Alike
@@ -94,70 +126,48 @@ License: CC-BY-NC-SA-3.0
 NOTES: The Public Domain - Enclosing the Commons of the Mind
   <http://thepublicdomain.org> by James Boyle <http://james-boyle.com>
 
-Files: data/samples/content.cory_doctorow.sst
-Copyright: 2008, Cory Doctorow
-License: CC-BY-NC-SA-3.0
+Files: data/samples/**/the_wealth_of_networks.yochai_benkler.sst
+Copyright: 2006, Yochai Benkler
+License: CC-BY-NC-SA-2.5
  Attribution-Noncommercial-Share Alike
- <http://creativecommons.org/licenses/by-nc-sa/3.0/>
-NOTES: CONTENT - Selected Essays on Technology, Creativity, Copyright and the
-  Future of the Future
-  <http://craphound.com/content> by Cory Doctorow <http://craphound.com>
-
-Files: data/samples/down_and_out_in_the_magic_kingdom.cory_doctorow.sst
-Copyright: 2003, Cory Doctorow
-License: CC-BY-NC-SA-1.0
- Attribution-NonCommercial-ShareAlike
- <http://creativecommons.org/licenses/by-nc-sa/1.0/>
-NOTES:  Down and Out in the Magic Kingdom <http://craphound.com/down>
-  by Cory Doctorow <http://craphound.com>
+ <http://creativecommons.org/licenses/by-nc-sa/2.5/>
+NOTES: The Wealth of Networks - How Social Production Transforms Markets and
+  Freedom <http://cyber.law.harvard.edu/wealth_of_networks/Main_Page>
+  by Yochai Benkler <http://www.benkler.org/>
 
-Files: data/samples/little_brother.cory_doctorow.sst
-Copyright: 2008, Cory Doctorow
-License: CC-BY-NC-SA-3.0
- Attribution-Noncommercial-Share Alike
- <http://creativecommons.org/licenses/by-nc-sa/3.0/>
-NOTES: Little Brother <http://craphound.com/littlebrother>
-  by Cory Doctorow <http://craphound.com>
+Files: data/samples/**/through_the_looking_glass.lewis_carroll.sst
+Copyright: 1871
+License: Public Domain
+NOTES: Through the Looking Glass by Lewis Carroll
 
-Files: data/samples/for_the_win.cory_doctorow.sst
-Copyright: 2010, Cory Doctorow
+Files: data/samples/**/two_bits.christopher_kelty.sst
+Copyright: 2008, Christopher Kelty
+           2008, Duke University Press
 License: CC-BY-NC-SA-3.0
  Attribution-Noncommercial-Share Alike
  <http://creativecommons.org/licenses/by-nc-sa/3.0/>
-NOTES: For the Win <http://craphound.com/ftw>
-  by Cory Doctorow <http://craphound.com>
-
-Files: data/samples/accelerando.charles_stross.sst
-Copyright: 2005, Charles Stross
-License: CC-BY-NC-ND-2.0
- Attribution-Noncommercial-No Derivative Works
- <http://creativecommons.org/licenses/by-nc-nd/2.0/>
- The SiSU preparation (presentations) of Accelerando are done with the kind
- permission of the author Charles Stross
-NOTES: Accelerando <http://www.accelerando.org/>
-  by Charles Stross <http://www.antipope.org/charlie/>
+NOTES: Two Bits - The Cultural Significance of Free Software
+  <http://twobits.net/> by Christopher Kelty <http://kelty.org/>
 
-Files: data/samples/un_contracts_international_sale_of_goods_convention_1980.sst
+Files: data/samples/**/un_contracts_international_sale_of_goods_convention_1980.sst
 Text: UN Contracts for International Sale of Goods
 Copyright:
 License:
 Author: UN, UNCITRAL
   URL: <http://www.un.org/>
 
-Files: data/samples/gullivers_travels.jonathan_swift.sst
-Copyright: 1726
+Files: data/samples/minimal/war_and_peace.leo_tolstoy.sst
+Copyright: 1869
 License: Public Domain
-NOTES: Gulliver's Travels by Jonathan Swift
-
-Files: data/samples/alices_adventures_in_wonderland.lewis_carroll.sst
-Copyright: 1865
-License: Public Domain
-NOTES: Alice's Adventures in Wonderland by Lewis Carroll
+NOTES: War and Peace by Leo Tolstoy
 
-Files: data/samples/through_the_looking_glass.lewis_carroll.sst
-Copyright: 1871
-License: Public Domain
-NOTES: Through the Looking Glass by Lewis Carroll
+Files: data/samples/**/viral_spiral.david_bollier.sst
+Copyright: 2008, David Bollier
+License: CC-BY-NC-3.0
+ Attribution-Noncommercial
+ <http://creativecommons.org/licenses/by-nc/3.0/>
+NOTES: Viral Spiral <http://viralspiral.cc/>
+  by David Bollier <http://www.bollier.org/>
 
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify