Merge branch 'upstream' into debian/sid

1 files changed, 46 insertions, 34 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 3a765e0..9d9f60f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,43 +6,55 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
+%% sisu-markup-samples_1.0.10.orig.tar.gz (2008-10-09:40/4)
+http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.10.orig.tar.gz
+  sisu-markup-samples_1.0.10.orig.tar.gz
+  sisu-markup-samples_1.0.10-1.dsc
+  sisu-markup-samples_1.0.10-1.diff.gz
+
+  * book index sample markup for sisu-0.69 series for books "Free Culture" and "The Wealth of Networks"
+
+  * debian, older markup samples retained as an earlier version of sisu makes it to lenny
+
+  * debian policy Standards-Version 3.8.0
+
 %% sisu-markup-samples_1.0.9.orig.tar.gz (2007-12-09:49/7)
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.9.orig.tar.gz
-  sisu-sample-markup_1.0.9.orig.tar.gz
-  sisu-sample-markup_1.0.9-1.dsc
-  sisu-sample-markup_1.0.9-1.diff.gz
+  aaad47cbf65057492c419c82dfd099bb 3439292 sisu-markup-samples_1.0.9.orig.tar.gz
+  90d623156e9abb0d9acd2eda51fd0b3b 629 sisu-markup-samples_1.0.9-1.dsc
+  a94df2fe86552c9670560ed5464843a5 3558 sisu-markup-samples_1.0.9-1.diff.gz
 
   * debian build update, with debian maintainer upload permission
 
 %% sisu-markup-samples_1.0.8.orig.tar.gz (2007-08-19:33/7)
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.8.orig.tar.gz
-  04ae2812617a4689666600a0fb32301f 3438571 sisu-sample-markup_1.0.8.orig.tar.gz
-  ca03c11467097d6049c43c54d0961ef5 606 sisu-sample-markup_1.0.8-1.dsc
-  b252d80000d280f0520b6d4b4bc8791c 3483 sisu-sample-markup_1.0.8-1.diff.gz
+  04ae2812617a4689666600a0fb32301f 3438571 sisu-markup-samples_1.0.8.orig.tar.gz
+  ca03c11467097d6049c43c54d0961ef5 606 sisu-markup-samples_1.0.8-1.dsc
+  b252d80000d280f0520b6d4b4bc8791c 3483 sisu-markup-samples_1.0.8-1.diff.gz
 
   * minor adjustment of rights headers (C) introduced (used by sisu-0.56.3)
 
 %% sisu-markup-samples_1.0.7.orig.tar.gz (2007w26/7 - 2007-07-01)
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.7.orig.tar.gz
-  2c0343896b8d3b35d89d2c30f63b4223 3438465 sisu-sample-markup_1.0.7.orig.tar.gz
-  4859c34968e4b94fbfe2e4987692a11b 606 sisu-sample-markup_1.0.7-1.dsc
-  e7c355086b52dd77c85f7fd950ab825a 3424 sisu-sample-markup_1.0.7-1.diff.gz
+  2c0343896b8d3b35d89d2c30f63b4223 3438465 sisu-markup-samples_1.0.7.orig.tar.gz
+  4859c34968e4b94fbfe2e4987692a11b 606 sisu-markup-samples_1.0.7-1.dsc
+  e7c355086b52dd77c85f7fd950ab825a 3424 sisu-markup-samples_1.0.7-1.diff.gz
 
   * fixes to skins post sisu-0.55.0, gpl3
 
 %% sisu-markup-samples_1.0.6.orig.tar.gz (2007w14/6 - 2007-04-07)
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.6.orig.tar.gz
-  feb20a8fcab83403f547aba7abe1c25b 3449753 sisu-sample-markup_1.0.6.orig.tar.gz
-  828dde02b5a8b3784b555d7b3ea5c0cf 606 sisu-sample-markup_1.0.6-1.dsc
-  167717d740dddc4784e2a73657a84c66 3394 sisu-sample-markup_1.0.6-1.diff.gz
+  feb20a8fcab83403f547aba7abe1c25b 3449753 sisu-markup-samples_1.0.6.orig.tar.gz
+  828dde02b5a8b3784b555d7b3ea5c0cf 606 sisu-markup-samples_1.0.6-1.dsc
+  167717d740dddc4784e2a73657a84c66 3394 sisu-markup-samples_1.0.6-1.diff.gz
 
   * declared document type, markup version identifier added
 
 %% sisu-markup-samples_1.0.5.orig.tar.gz (2007w13/6 - 2007-03-31)
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.5.orig.tar.gz
-  0fe25e9da2320d07bb8b4c6ebebc15eb 3449644 sisu-sample-markup_1.0.5.orig.tar.gz
-  61c8647c7ba20b279800e51c1a06112f 606 sisu-sample-markup_1.0.5-1.dsc
-  79a76ea89ce2fce80b76332ae2bb3ddc 3338 sisu-sample-markup_1.0.5-1.diff.gz
+  0fe25e9da2320d07bb8b4c6ebebc15eb 3449644 sisu-markup-samples_1.0.5.orig.tar.gz
+  61c8647c7ba20b279800e51c1a06112f 606 sisu-markup-samples_1.0.5-1.dsc
+  79a76ea89ce2fce80b76332ae2bb3ddc 3338 sisu-markup-samples_1.0.5-1.diff.gz
 
   * skins updated to work with sisu-0.51.0
 
@@ -55,18 +67,18 @@ http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-mark
 
 %% sisu-markup-samples_1.0.4.orig.tar.gz (2006w48/1 - 20061127)
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.4.orig.tar.gz
-  58d1a28fe966e741717042a53afcaf3f 3400359 sisu-sample-markup_1.0.4.orig.tar.gz
-  b1451bb2b46e104283cf42ae6c7630f0 606 sisu-sample-markup_1.0.4-1.dsc
-  f4c3a2e9f8a5ed17bdc2ee8c44f79a50 2907 sisu-sample-markup_1.0.4-1.diff.gz
+  58d1a28fe966e741717042a53afcaf3f 3400359 sisu-markup-samples_1.0.4.orig.tar.gz
+  b1451bb2b46e104283cf42ae6c7630f0 606 sisu-markup-samples_1.0.4-1.dsc
+  f4c3a2e9f8a5ed17bdc2ee8c44f79a50 2907 sisu-markup-samples_1.0.4-1.diff.gz
 
   * "The Wealth of Networks" by Yochai Benkler, added as markup sample
     ["visual" representation of table 3.1 of document requires >= sisu-0.48.8]
 
 %% sisu-markup-samples_1.0.3.orig.tar.gz (2006w44/2 - 20061031)
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.3.orig.tar.gz
-  c476c4c53712dbb09cacded73a94b98b 2230991 sisu-sample-markup_1.0.3.orig.tar.gz
-  89bd109ee4e300b2f32f8dfe717f93a4 606 sisu-sample-markup_1.0.3-1.dsc
-  8d8f52c0b2334d265914c989471ecbb9 2549 sisu-sample-markup_1.0.3-1.diff.gz
+  c476c4c53712dbb09cacded73a94b98b 2230991 sisu-markup-samples_1.0.3.orig.tar.gz
+  89bd109ee4e300b2f32f8dfe717f93a4 606 sisu-markup-samples_1.0.3-1.dsc
+  8d8f52c0b2334d265914c989471ecbb9 2549 sisu-markup-samples_1.0.3-1.diff.gz
 
   * housekeeping, minor adjustments
 
@@ -77,11 +89,11 @@ http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-mark
 
 %% sisu-markup-samples_1.0.2.orig.tar.gz (2006w25/6 - 20060624)
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.2.orig.tar.gz
-  6f644ebf717dc97ccc84864e01c2b215 2229833 sisu-sample-markup_1.0.2.orig.tar.gz
-  5e5349b81393d5e0c17512e071526836 610 sisu-sample-markup_1.0.2-1.dsc
-  b30807dfda85ae385b270c7380969dd4 3100 sisu-sample-markup_1.0.2-1.diff.gz
-  45ac8d57615689887726fc7085984796 610 sisu-sample-markup_1.0.2-2.dsc         (2006w29/1 - 20060717)
-  d1f5922fcb87ec41add801922ac33a3a 3890 sisu-sample-markup_1.0.2-2.diff.gz
+  6f644ebf717dc97ccc84864e01c2b215 2229833 sisu-markup-samples_1.0.2.orig.tar.gz
+  5e5349b81393d5e0c17512e071526836 610 sisu-markup-samples_1.0.2-1.dsc
+  b30807dfda85ae385b270c7380969dd4 3100 sisu-markup-samples_1.0.2-1.diff.gz
+  45ac8d57615689887726fc7085984796 610 sisu-markup-samples_1.0.2-2.dsc         (2006w29/1 - 20060717)
+  d1f5922fcb87ec41add801922ac33a3a 3890 sisu-markup-samples_1.0.2-2.diff.gz
 
   * document samples placed within sub-directory non-free to avoid clashes with
     content in the dfsg compliant (Debian Free Software Guideline) document
@@ -97,19 +109,19 @@ http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-mark
 
 %% sisu-markup-samples_1.0.1.orig.tar.gz (2006w21/7 - 20060528)
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.1.orig.tar.gz
-  f7dc3e7220ead16ab91969f7a0a9ac1b 2828817 sisu-sample-markup_1.0.1.orig.tar.gz
-  24c6a42cbcc42891f5cd1183937ed83b 610 sisu-sample-markup_1.0.1-2.dsc
-  823d934fcee5394fba5ba237dea66006 3255 sisu-sample-markup_1.0.1-2.diff.gz
-  f9a56e76400fdf5d470f64d02f4e1033 610 sisu-sample-markup_1.0.1-1.dsc
-  2998d82e2417f45aa795ca7fbf1a890b 3058 sisu-sample-markup_1.0.1-1.diff.gz
+  f7dc3e7220ead16ab91969f7a0a9ac1b 2828817 sisu-markup-samples_1.0.1.orig.tar.gz
+  24c6a42cbcc42891f5cd1183937ed83b 610 sisu-markup-samples_1.0.1-2.dsc
+  823d934fcee5394fba5ba237dea66006 3255 sisu-markup-samples_1.0.1-2.diff.gz
+  f9a56e76400fdf5d470f64d02f4e1033 610 sisu-markup-samples_1.0.1-1.dsc
+  2998d82e2417f45aa795ca7fbf1a890b 3058 sisu-markup-samples_1.0.1-1.diff.gz
 
   * minor markup fix
 
 %% sisu-markup-samples_1.0.0.orig.tar.gz (2006w19/6 - 20060514)
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.0.orig.tar.gz
-  f806d85b7708533dff8950e4c15f024b 2826768 sisu-sample-markup_1.0.0.orig.tar.gz
-  sisu-sample-markup_1.0.0-1.dsc
-  sisu-sample-markup_1.0.0-1.diff.gz
+  f806d85b7708533dff8950e4c15f024b 2826768 sisu-markup-samples_1.0.0.orig.tar.gz
+  sisu-markup-samples_1.0.0-1.dsc
+  sisu-markup-samples_1.0.0-1.diff.gz
 
   * sample markup has been separated from the main sisu package and
     sisu-examples where it once resided, which are in debian main to non-free,