Merge branch 'upstream' into debian/sid

1 files changed, 46 insertions, 0 deletions

diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
new file mode 100644
index 00000000..b5bf00c5
--- /dev/null
+++ b/CHANGELOG_v2
@@ -0,0 +1,46 @@
+%% SiSU version 2
+
+* homepage at: <http://www.jus.uio.no/sisu>
+* <http://www.jus.uio.no/sisu/SiSU/download>
+* <http://www.jus.uio.no/sisu/SiSU/changelog>
+* <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 CHANGELOG_v1 CHANGELOG_v2 README data/doc/sisu/
+
+Reverse Chronological:
+
+%% Development branch UNSTABLE
+
+%% 2.0.0.orig.tar.gz (2010-03-06:09/6)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.0.orig.tar.gz
+  sisu_2.0.0.orig.tar.gz
+  sisu_2.0.0-1.dsc
+  sisu_2.0.0-1.diff.gz
+
+  * sisu v2
+
+    * default command 'sisu' runs version 2; to run version 1 use version flag
+      'sisu --v1 [filename]'
+
+    * new middle layer (document abstraction) that uses ruby objects to
+      represent data (instead of strings)
+
+    * downstream libraries updated to use v2 middle layer
+
+    * sisu markup, changes to headers (metadata), input otherwise unchanged
+
+    * output much the same as for version 1 with some tweaks
+      * search, sql table structure changed for version 2, incompatible
+      * internal linking of documents is once again supported
+      * LaTeX/pdf book indexes link within the pdf text rather than to HTML
+        version of document
+
+    * EPUB output introduced using -e flag
+
+  * sisu v1
+
+    * this tarball also includes v1 see CHANGELOG_v1, if installed directly
+      from tarball version 1 should be available as sisu1
+
+    * version 1 should be available as sisu --v1 [filename]