Merge branch 'upstream' into debian/sid

1 files changed, 28 insertions, 3 deletions

diff --git a/CHANGELOG b/CHANGELOG
index f009bbe..b1a11de 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,11 +6,29 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
+%% 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
+
+  [post debian squeeze]
+
+  * removes v1 branch, v1 markup (headers) no longer supported by sisu (v3)
+
+  * v2 & v3 samples moved to common directory data/samples
+    [Note: sisu v2 and v3 will run against the same docuements, separate v2 and
+    v3 directories may be introduced later if determined to be useful (e.g. v3
+    permits alternative directory structure using language code for markup
+    source]
+
 %% sisu-markup-samples_2.0.7.orig.tar.gz (2010-10-11:41/1)
+http://git.sisudoc.org/?p=doc/sisu-markup-samples.git;a=shortlog;h=refs/tags/debian/2.0.7-1
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.7.orig.tar.gz
-  sisu-markup-samples_2.0.7.orig.tar.gz
-  sisu-markup-samples_2.0.7-1.dsc
-  sisu-markup-samples_2.0.7-1.diff.gz
+  4de1e3e74b5a9df3fba796452b119e625717e29abb96128523f9a5ab44d3c9ae 16322590 sisu-markup-samples_2.0.7.orig.tar.gz
+  d8640e329c57e89d7c05d1c424696a19701adf907d847458b21c2ab7b7922e16 1290 sisu-markup-samples_2.0.7-1.dsc
+  e975b8c91baaf4d92efde50010de836a060cc8965a17239338bf298cbc0252ba 6265 sisu-markup-samples_2.0.7-1.diff.gz
 
   [debian in freeze for squeeze, the only changes are documentation related]
 
@@ -30,6 +48,7 @@ http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-mark
     associated linking documents
 
 %% sisu-markup-samples_2.0.6.orig.tar.gz (2010-08-24:34/2)
+http://git.sisudoc.org/?p=doc/sisu-markup-samples.git;a=shortlog;h=refs/tags/debian/2.0.6-1
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.6.orig.tar.gz
   adc3653d1577ff0bfd1e706d568c1ccae2482e155b2d9944fc1a732953915e31 15771014 sisu-markup-samples_2.0.6.orig.tar.gz
   cdddb78af7550103ad23f55aa8295bfcbea9ff1058f066bfe5cdbb897a4c7f25 1290 sisu-markup-samples_2.0.6-1.dsc
@@ -64,6 +83,7 @@ http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-mark
     * add Uploaders field
 
 %% sisu-markup-samples_2.0.5.orig.tar.gz (2010-07-15:28/4)
+http://git.sisudoc.org/?p=doc/sisu-markup-samples.git;a=shortlog;h=refs/tags/debian/2.0.5-1
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.5.orig.tar.gz
   45366204c646b6f9fd751040cfe4e0380554922e79048746e66bca340ec919f4 14114039 sisu-markup-samples_2.0.5.orig.tar.gz
   4c9d44b86d2a1b6c5d6a86c8c4f1ad3805d72d51101864f4003c3870b6fd48cc 1241 sisu-markup-samples_2.0.5-1.dsc
@@ -107,6 +127,7 @@ http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-mark
     * 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
   ca6001d7373ad324356d08c8d043f444363bd9a7fe5f71e9f74586c31cded21e 14056624 sisu-markup-samples_2.0.4.orig.tar.gz
   c53958da961153775ecd4f4fbed658418d413187501520679ecda67e97994c2a 1241 sisu-markup-samples_2.0.4-1.dsc
@@ -118,6 +139,7 @@ http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-mark
     touches
 
 %% sisu-markup-samples_2.0.3.orig.tar.gz (2010-05-06:18/4)
+http://git.sisudoc.org/?p=doc/sisu-markup-samples.git;a=shortlog;h=refs/tags/debian/2.0.3-1
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.3.orig.tar.gz
   b787e47b3936bb171291b4373a66e3127c26d7b9c19ac8287e3824fe07ef852e 13167221 sisu-markup-samples_2.0.3.orig.tar.gz
   21384a6f5ab53f8b09a1e746eda755cddf9aaca266724228e3648bad4bb11e6e 1235 sisu-markup-samples_2.0.3-1.dsc
@@ -129,6 +151,7 @@ http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-mark
   * small touches
 
 %% sisu-markup-samples_2.0.2.orig.tar.gz (2010-04-27:17/2)
+http://git.sisudoc.org/?p=doc/sisu-markup-samples.git;a=shortlog;h=refs/tags/debian/2.0.2-1
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.2.orig.tar.gz
   fa6f66c8ac3076a82537287e18ba30bc938071c3a4ea384b35e789869407040b 13147656 sisu-markup-samples_2.0.2.orig.tar.gz
   c4abff6bdeaa734854245e7727ca70bb7a2d8573b690a71a6f2788f130232371 1235 sisu-markup-samples_2.0.2-1.dsc
@@ -140,6 +163,7 @@ http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-mark
   * topic_register, minor tweaking for a few documents
 
 %% sisu-markup-samples_2.0.1.orig.tar.gz (2010-03-23:12/1)
+http://git.sisudoc.org/?p=doc/sisu-markup-samples.git;a=shortlog;h=refs/tags/debian/2.0.1-1
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.1.orig.tar.gz
   21201eddcc9c6fff4f36eee4df6790042851cd855133519bc0b3b75729316825 13147092 sisu-markup-samples_2.0.1.orig.tar.gz
   51d0d02d7ed05392ff81e6ebda687173e94e144d8c113b651a887854a8c30bae 1235 sisu-markup-samples_2.0.1-1.dsc
@@ -153,6 +177,7 @@ http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-mark
   [uploaded with sisu-2.0.4]
 
 %% sisu-markup-samples_2.0.0.orig.tar.gz (2010-03-06:09/6)
+http://git.sisudoc.org/?p=doc/sisu-markup-samples.git;a=shortlog;h=refs/tags/debian/2.0.0-1
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.0.orig.tar.gz
   a62f195143a13adec1107463c6cb5c87887fd619c8e093e10216e742e4934caf 12878458 sisu-markup-samples_2.0.0.orig.tar.gz
   99c377991bc36cdce27fac7e3f602b40219a2789036994a8acb97d57292cf4cc 1235 sisu-markup-samples_2.0.0-1.dsc