Merge branch 'upstream' into debian/sid

1 files changed, 39 insertions, 3 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 4dd3eccb..712181bf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,11 +9,47 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
+%% sisu_0.62.0.orig.tar.gz (2007-10-18:42/4)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.0.orig.tar.gz
+  sisu_0.62.0.orig.tar.gz
+  sisu_0.62.0-1.dsc
+  sisu_0.62.0-1.diff.gz
+
+  * directory shunting ... [some resulting re-initialization necessary]
+    * markup source directory (src), all shared markup source placed in a
+      common directory [instead of being in output files generated
+      sub-directory]
+    * images, output images used by html moved, now in image directory instead
+      of image_local; system images moved from image to image_sys [to make sure
+      they are always available, i.e. not written over (by subsequent images
+      given same name)]
+
+  * remote, (put, get) placed in single file (consider separating later)
+
+  * embedded content, included binaries such as images, audio, video, copy
+    content associated with document to desired output locations, [decide how
+    audio, video/multimedia are to be handled, initially just links to content]
+
+  * copy images associated with document along with document, does not take
+    care of skins though, for all images still need to use -CC
+
+  * sysenv remote placement, and config, define multiple hosts for rsync or scp
+    placement of output (one set of displayed urls associated with such output
+    files)
+
+  * special character exceptions, exception, fix (:code underscore angle bracket
+    issue)
+
+  * pruning
+
+  * debian/control, added depends on rsync, used extensively (now also
+    internally)
+
 %% sisu_0.61.0.orig.tar.gz (2007-10-12:41/5)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.61.0.orig.tar.gz
-  sisu_0.61.0.orig.tar.gz
-  sisu_0.61.0-1.dsc
-  sisu_0.61.0-1.diff.gz
+  3a2329726d49945247b1f4340482c895 1474630 sisu_0.61.0.orig.tar.gz
+  c02eb65a86eac49e5735253a05b86c57 606 sisu_0.61.0-1.dsc
+  f68431c83e37939fd4cfa7fa085ed31a 144888 sisu_0.61.0-1.diff.gz
 
   * dal, markup shortcut for available outputs, present as grouped text object,
     (as opposed to each available output being a separate object) this makes