Merge branch 'upstream' into debian/sid

1 files changed, 29 insertions, 16 deletions

diff --git a/CHANGELOG b/CHANGELOG
index aa90dcdf..8cbe7540 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,17 +15,21 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.0.orig.tar.gz
   sisu_0.62.0-1.dsc
   sisu_0.62.0-1.diff.gz
 
-  [NOTE/WARNING: some directories moved, as overwrites are not automatic, will
-  need manual adjustment of output locations (moving of a couple of
-  directories, and possible creation of another) for images and shared source
-  markup if any, see notes  below (on directory shunting)]
+  [NOTE/WARNING: some directories moved, for existing sites will need manual
+  adjustment of output locations, (moving of a couple of image directories, and
+  if sharing text source the creation of shared source directories src and
+    pod), see notes  below (on directory shunting)]
 
   * directory shunting ... [some resulting re-setting/configuration up
     necessary]
-    * markup source directory (src), all shared markup source placed in a
-      common directory (instead of being in output files generated
-      sub-directory) [NOTE: New src directory for shared markup source output
-      required at [output path]/src ]
+
+    * markup source and source pod directory (src and pod), all shared markup
+      source placed in common directories src for text source, and pod for
+      binary (instead of being in output files generated sub-directory) [NOTE:
+      New src and new pod directory for shared markup source output required at
+      [output path]/src and [output path]/pod ] [if nothing else makes repo of
+      online submissions easier]
+
     * 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
@@ -34,6 +38,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.0.orig.tar.gz
       path]/_sisu/image_local is moved to [output path]/_sisu/image (and old
       _sisu/image is now _sisu/image_sys) ]
 
+  * pwd directory stub name exception, regexs in sysenv and elsewhere, when
+    determining the pwd stub, take stub from parent of a directory named src
+    (todo with directory shunting, and placing of output source markup files
+    where shared in a directory named src)
+
   * remote, (put, get) placed in single file (consider separating later)
 
   * conf, remote, work on rsync building of basic remote site structure
@@ -60,21 +69,25 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.0.orig.tar.gz
 
   * conditionals rearranged, (scope for breakage)
 
-  * debian/control, added depends on rsync, used extensively (now also
-    internally)
-
-  * fictionbook, (-f) first pass at output, develop or drop?
-    fictionbook is interesting, links:
+  * fictionbook, (-f) first pass at output, look into further and develop or
+    drop? fictionbook is interesting, links:
       http://www.fictionbook.org/index.php/Eng:FictionBook
       http://www.fictionbook.org/index.php/Eng:FictionBook_description
       http://en.wikipedia.org/wiki/FictionBook
 
-  * NOTE: there appears to be a bug with String.strip in ruby 1.9.0 (2007-09-10
-    patchlevel 0) [i486-linux] ? [behaviour (current in Debian Sid) noted in
-    2007-09-18:38/2, confirmed again in irb1.9 today] (else is with my setup!)
+  * debian/control added depends on rsync, used extensively (now also
+    internally)
+
+  NOTE: fixed today in Debian Sid, bug with String.strip in ruby 1.9.0
+    (2007-09-10 patchlevel 0) [i486-linux] ? [behaviour noted in
+    2007-09-18:38/2, existed till 2007-10-18:42/5]:
     ' apples, oranges'.strip #==> "apples," # expected "apples, oranges"
     ' apples, oranges '.strip #does as expected
 
+    ruby 1.9, for present time retain restriction on running and testing sisu
+    with ruby 1.9, there are still issues with 1.9 (at the C stack level, and
+    probably some in sisu compatibility/updating as well)
+
 %% 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
   3a2329726d49945247b1f4340482c895 1474630 sisu_0.61.0.orig.tar.gz