Merge tag 'sisu-markup-samples_3.0.1' into debian/sid

1 files changed, 29 insertions, 45 deletions

diff --git a/CHANGELOG b/CHANGELOG
index b1a11de..49738cb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,12 +6,28 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
+%% sisu-markup-samples_3.0.1.orig.tar.xz (2012-04-23:17/01)
+http://git.sisudoc.org/?p=doc/sisu-markup-samples.git;a=shortlog;h=refs/tags/debian/3.0.1-1
+http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_3.0.1.orig.tar.xz
+  sisu-markup-samples_3.0.1.orig.tar.xz
+  sisu-markup-samples_3.0.1-1.dsc
+  sisu-markup-samples_3.0.1-1.debian.tar.gz
+
+  * The Public Domain - Enclosing the Commons of the Mind, James Boyle
+    added, so far without book index, and font attributes (bold, italics)
+
+  * Free as in Freedom (2.0) - Richard Stallman and the Free Software
+    Revolution, Sam Williams, 2nd edition revisions Richard Stallman
+
+  * COPYRIGHT, format changed, influenced by Machine-readable debian/copyright
+    file <http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/>
+
 %% sisu-markup-samples_3.0.0.orig.tar.gz (2011-02-16:07/03)
 http://git.sisudoc.org/?p=doc/sisu-markup-samples.git;a=shortlog;h=refs/tags/debian/3.0.0-1
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_3.0.0.orig.tar.gz
-  sisu-markup-samples_3.0.0.orig.tar.gz
-  sisu-markup-samples_3.0.0-1.dsc
-  sisu-markup-samples_3.0.0-1.debian.tar.gz
+  999f3cc572d0558a6af4539db0c51691dcff3371d4f92e096cbf5835806aeed4 8446814 sisu-markup-samples_3.0.0.orig.tar.gz
+  7d9d434c74a1e96da3732e420d483466d7ca1266d4e6fba4bf7f21b9e3f73aad 1307 sisu-markup-samples_3.0.0-1.dsc
+  8f0ab7030fd1e4be28c9bd6a60f99e3e2414fb0f75a109f34568e0184247bb93 7316 sisu-markup-samples_3.0.0-1.debian.tar.gz
 
   [post debian squeeze]
 
@@ -94,38 +110,6 @@ http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-mark
 
   * CONTENT, remove image based on original book cover
 
-  (2010-08-23:34/1)
-  sisu-markup-samples_2.0.5-2.dsc
-  sisu-markup-samples_2.0.5-2.diff.gz
-
-  [debian in freeze for squeeze, the only changes are documentation related]
-
-  * Viral Spiral, David Bollier markup sample added
-
-  * Book index fixes to existing markup samples
-
-  * Minor adjustments to markup sample headers where appropriate
-
-  * miscellaneous fixes,
-    * add missing skin for v1 markup of "CONTENT", Cory Doctorow
-    * "CONTENT", use preferred curly braces with emphasized text (v1 & v2)
-    * "Free Culture", document structure
-    * add v1 markup for "Democratizing Innovation", Eric von Hippel
-    * (headers & yaml), links added/updated
-
-  * COPYRIGHT and README update on contents
-
-  * Manpage update
-
-  * debian markup-samples headers tended to
-
-  * debian/control
-    * update contents
-    * make description match sisu
-    * update Standards-Version 3.9.1
-    * update Maintainers
-    * add Uploaders field
-
 %% sisu-markup-samples_2.0.4.orig.tar.gz (2010-06-27:25/7)
 http://git.sisudoc.org/?p=doc/sisu-markup-samples.git;a=shortlog;h=refs/tags/debian/2.0.4-1
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.4.orig.tar.gz
@@ -170,7 +154,7 @@ http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-mark
   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 
+    and the Future of the Future, Cory Doctorow
 
   * minor touches
 
@@ -187,25 +171,25 @@ http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-mark
     version 1 markup samples retained
 
   * document markup samples include:
-  
+
     Free as in Freedom - Richard Stallman's Crusade for Free Software, Sam
     Williams
-    
+
     Free Culture - How Big Media Uses Technology and the Law to Lock Down
     Culture and Control Creativity, Lawrence Lessig
-    
+
     The Wealth of Networks - How Social Production Transforms Markets and
     Freedom, Yochai Benkler
-    
+
     Two Bits - The Cultural Significance of Free Software, Christopher Kelty
-    
+
     Free For All - How Linux and the Free Software Movement Undercut the High
     Tech Titans, Peter Wayner
-    
+
     The Cathederal and the Bazaar, Eric Raymond
-    
+
     Little Brother, Cory Doctorow
-    
+
     Accelerando, Charles Stross
 
 %% sisu-markup-samples_1.1.2.orig.tar.gz (2010-02-17:07/3)
@@ -240,7 +224,7 @@ http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-mark
     v1/README
 
   * updated COPYRIGHT and v1/README information, includes list of markup
-    samples 
+    samples
 
   * sisu 1.0.0 does not support older style headers, old style markup samples
    removed