Merge branch 'upstream' into debian/sid

1 files changed, 24 insertions, 0 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 92a56752..5da70577 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,11 +4,35 @@
 * <http://sisudoc.org/sisu/sisu_manual>
 * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
 * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
+* CHANGELOG README data/doc/sisu/
 
 Reverse Chronological:
 
 %% STABLE MANIFEST
 
+%% 1.0.0.orig.tar.gz (2009-12-19:50/6)
+http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.0.orig.tar.gz
+  sisu_1.0.0.orig.tar.gz
+  sisu_1.0.0-1.dsc
+  sisu_1.0.0-1.diff.gz
+  * open v1 branch, bump series vesion number to 1
+    * with the introduction of sisu version 2 (a new middle layer engine)
+      imminent, that will be maintained in parallel with this version, it is
+      time to have a version 1 branch
+    * version 1 is pretty much the previous release, it will be maintained
+      alongside version 2 (in the tarball) and the directory structure is
+      modified to accommodate this
+    * [version 2: will have a different middle layer; markup remains the same
+      apart from some modification to document headers]
+
+  * param / document header changed not to accept older markup, e.g. must use
+    '@title:' rather than '0~title'
+
+  * minor changes inter alia for new directory structure
+
+  * documentation, modified description of command flags -m and -n (in line
+    with communication on Debian bug #555496, closing it)  
+
 %% sisu_0.71.4.orig.tar.gz (2009-08-29:34/6)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.4.orig.tar.gz
   a9accd67316fcc21fa289dd3923641b182023ee3e038ee7c3324b6e71b129a68 1551081 sisu_0.71.4.orig.tar.gz