Merge branch 'upstream' into debian/sid

2 files changed, 40 insertions, 15 deletions

diff --git a/data/doc/sisu/CHANGELOG b/data/doc/sisu/CHANGELOG
index 9743aa8f..29033c20 100644
--- a/data/doc/sisu/CHANGELOG
+++ b/data/doc/sisu/CHANGELOG
@@ -9,11 +9,36 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
+%% sisu_0.64.0.orig.tar.gz (2008-01-02:00/3)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.0.orig.tar.gz
+  sisu_0.64.0.orig.tar.gz
+  sisu_0.64.0-1.dsc
+  sisu_0.64.0-1.diff.gz
+
+  * sql, postgresql allow tcp/ip connections... take relevant parameters from
+    resource configuration file, sisurc.yml
+
+  * sql (postgresql, sqlite), switch primary keys to bigint (as requested)
+
+  * processing, default processing directory moved to /tmp and renamed
+    _sisu_processing~ [previously was in user's home ~/_sisu_processing]
+    a user subdirectory is made and permissions set to user 700
+    pros: get rid of an unattractive directory in user's home
+    cons: /tmp is usually in / which is frequently a relatively small directory
+    compromise: is possible to set an alternative path for processing in
+    sisurc.yml
+
+  * copyright dates updated
+
+  * debian/postrm.sisu on purge remove /etc/sisu, should fix packaging bug
+    #454372 (reported by Kumar Appaiah), [thank you, and sorry for not having
+    acknowledged this earlier]
+
 %% sisu_0.63.0.orig.tar.gz (2007-12-20:51/4)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.63.0.orig.tar.gz
-  sisu_0.63.0.orig.tar.gz
-  sisu_0.63.0-1.dsc
-  sisu_0.63.0-1.diff.gz
+  280792a14893ba5a912a7d300a9c2d74 1484075 sisu_0.63.0.orig.tar.gz
+  27523129a29d1d27e8b3b343f525a5d6 629 sisu_0.63.0-1.dsc
+  958736cfeaf188806a0933c775de1294 145944 sisu_0.63.0-1.diff.gz
 
   * texpdf, (latex pdf) generate sisu latex output in a single pass
     
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
index 88a5e69a..a208099a 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
@@ -18,9 +18,9 @@
 
 @date.available: 2007-08-28
 
-@date.modified: 2007-12-20
+@date.modified: 2008-01-02
 
-@date: 2007-12-20
+@date: 2007-01-02
 
 @level: new=C; break=1; num_top=1
 
@@ -55,7 +55,7 @@
 
 Download the latest version of SiSU (and SiSU markup samples):~{ Breakage and Fixes Report<br> http://www.jus.uio.no/sisu/SiSU/breakage_and_fixes.html }~
 
-_* {~^ sisu_0.63.0.orig.tar.gz (of 2007-12-20:51/4) }http://www.jus.uio.no/sisu/pkg/src/sisu_0.63.0.orig.tar.gz
+_* {~^ sisu_0.64.0.orig.tar.gz (of 2008-01-02:00/3) }http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.0.orig.tar.gz
 
 _* {~^ sisu-markup-samples_1.0.8.orig.tar.gz (of 2007-08-19:33/7 ) }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_1.0.8.orig.tar.gz *~sisu-markup-samples
 
@@ -90,23 +90,23 @@ deb-src http://www.jus.uio.no/sisu/archive unstable main non-free
 
 !_ Source
 
-_* {~^ sisu_0.63.0.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.63.0.orig.tar.gz
+_* {~^ sisu_0.64.0.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.0.orig.tar.gz
 
-_* {~^ sisu_0.63.0-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.63.0-1.diff.gz
+_* {~^ sisu_0.64.0-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.0-1.diff.gz
 
-_* {~^ sisu_0.63.0-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_0.63.0-1.dsc
+_* {~^ sisu_0.64.0-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.0-1.dsc
 
 !_ Debs
 
-_* {~^ sisu_0.63.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.63.0-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
+_* {~^ sisu_0.64.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.64.0-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
 
-_* {~^ sisu-complete_0.63.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_0.63.0-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
+_* {~^ sisu-complete_0.64.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_0.64.0-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
 
-_* {~^ sisu-pdf_0.63.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_0.63.0-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
+_* {~^ sisu-pdf_0.64.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_0.64.0-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
 
-_* {~^ sisu-postgresql_0.63.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_0.63.0-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
+_* {~^ sisu-postgresql_0.64.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_0.64.0-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
 
-_* {~^ sisu-sqlite_0.63.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_0.63.0-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
+_* {~^ sisu-sqlite_0.64.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_0.64.0-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
 
 For changelogs see:
 
@@ -132,7 +132,7 @@ _1 http://www.jus.uio.no/sisu/sisu_markup_samples_changelog/changelog_markup_sam
 
 The RPM is generated Alien~{ http://www.kitenet.net/programs/alien/ }~ from two deb packages (sisu and sisu-doc). Dependencies are not handled, not even that of the essential Ruby.
 
-_* {~^ sisu-0.63.0-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-0.63.0-2.noarch.rpm ~{ untested, created using: alien -r sisu_0.63.0-1_all.deb }~
+_* {~^ sisu-0.64.0-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-0.64.0-2.noarch.rpm ~{ untested, created using: alien -r sisu_0.64.0-1_all.deb }~
 
 _* {~^ sisu-markup-samples_1.0.8.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_1.0.6.orig-2.noarch.rpm ~{ <br> untested, created using alien }~