Merge branch 'upstream' into debian/sid

2 files changed, 69 insertions, 13 deletions

diff --git a/data/doc/sisu/CHANGELOG b/data/doc/sisu/CHANGELOG
index e49c2cfa..5495614f 100644
--- a/data/doc/sisu/CHANGELOG
+++ b/data/doc/sisu/CHANGELOG
@@ -6,11 +6,34 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
+%% sisu_0.55.6.orig.tar.gz (2007-07-28:30/6)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.6.orig.tar.gz
+  sisu_0.55.6.orig.tar.gz
+  sisu_0.55.6-1.dsc
+  sisu_0.55.6-1.diff.gz
+
+  * matching multiple and consecutive urls within a paragraph, refinements
+    * db html (html_lite), multiple urls, bug fix
+    * consecutive url matching: html, html_lite, xml, odf, texpdf
+
+  * open archive initiative for metadata harvesting, initial implementation,
+    Dublin Core, XML output available (-O), decide use later (filenames, output
+    dir etc.)
+
+  * rinstall as both a rant and rake installer for sisu
+    * Rakefile softlink to rinstall
+    * Rantfile softlink to rinstall
+
+  * debian vim
+    * moved installation of syntax and ftplugin back to vim/addons
+    * added recommends vim-addon-manager
+    (thanks zack)
+
 %% sisu_0.55.5.orig.tar.gz (2007-07-22:29/7)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.5.orig.tar.gz
-  sisu_0.55.5.orig.tar.gz
-  sisu_0.55.5-1.dsc
-  sisu_0.55.5-1.diff.gz
+  cb4e98ced1d11f4ac8c84d80b773fe92 1268030 sisu_0.55.5.orig.tar.gz
+  38da598ad949b3efc623b676f9826fe1 606 sisu_0.55.5-1.dsc
+  c5a9dacc9f8993553e0a78f927af2147 142162 sisu_0.55.5-1.diff.gz
 
   * initialize output directory, fix (Closes: #434168)
     [(a trivial but serious) bug introduced with changed use of variable in
@@ -26,6 +49,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.5.orig.tar.gz
     open standards
 
   * debian vim, syntax and ftplugin install moved to /usr/share/vim-scripts
+    (syntax file synced with Bram, thanks)
 
 %% sisu_0.55.4.orig.tar.gz (2007-07-20:29/5)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.4.orig.tar.gz
diff --git a/data/doc/sisu/README b/data/doc/sisu/README
index 789f95e2..1742d410 100644
--- a/data/doc/sisu/README
+++ b/data/doc/sisu/README
@@ -138,16 +138,22 @@ They may be downloaded from:
 Otherwise to install SiSU from source, check information at:
   <http://www.jus.uio.no/sisu/SiSU/download.html#current>
 
-two alternative modes of installation from source are provided,
-setup.rb (by Minero Aoki) and a rant(by Stefan Lang) built install file,
-in either case: the first steps are the same, download and unpack the
-source file:
+alternative modes of installation from source are provided,
+setup.rb (by Minero Aoki),
+rake (by Jim Weirich) built install file,
+rant (by Stefan Lang) built install file,
+
+Ruby is the essential dependency for the basic operation of SiSU
 
 1. Download the latest source (information available) from:
   <http://www.jus.uio.no/sisu/SiSU/download.html#current>
 
 2. Unpack the source
 
+Note however, that additional external package dependencies,
+such as texlive or postgresql should you desire to use it
+are not taken care of for you.
+
 %% to use setup.rb
 ---------------
 this is a three step process,
@@ -162,8 +168,30 @@ in the root directory of the unpacked SiSU as root type:
     <http://i.loveruby.net/en/projects/setup/>
     <http://i.loveruby.net/en/projects/setup/doc/usage.html>
 
+%% to use install (prapared with "Rake")
+---------------
+Rake must be installed on your system:
+  <http://rake.rubyforge.org/>
+  <http://rubyforge.org/frs/?group_id=50>
+
+in the root directory of the unpacked SiSU as root type:
+  rake
+
+or
+  rake base
+
+This makes use of Rake (by Jim Weirich) and the provided Rakefile
+
+For a list of alternative actions you may type:
+  rake help
+  rake -T
+
 %% to use install (prapared with "Rant")
 ---------------
+(you may use the instructions above for rake substituting rant if rant is
+installed on your system, or you may use an independent installer created using
+rant as follows:)
+
 in the root directory of the unpacked SiSU as root type:
   ruby ./sisu-install
 
@@ -198,19 +226,23 @@ SiSU can make use of if available, (the use/requirement of some of which are
 interdependent for specific actions by SiSU):
 
 Package: sisu
-Depends: ruby (>= 1.8.4), libwebrick-ruby
+Architecture: all
+Depends: ruby (>= 1.8.2), libwebrick-ruby, unzip, zip
+Conflicts: vim-sisu, sisu-vim, sisu-remote
+Replaces: vim-sisu, sisu-vim
 Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, librmagick-ruby, trang,
-  tidy, librexml-ruby, zip, unzip, openssl, rsync, openssh-client | lsh-client,
-  keychain, hyperestraier, kdissert
-Suggests: libfcgi-ruby1.8, rcs | cvs, lv, texinfo, pinfo, rename
+tidy, librexml-ruby, openssl, rsync, openssh-client | lsh-client, keychain,
+hyperestraier, kdissert, vim-addon-manager
+Suggests: rcs | cvs, lv, texinfo, pinfo
 
 Package: sisu-complete
 Depends: ruby (>= 1.8.4), sisu, sisu-pdf, sisu-postgresql, sisu-sqlite
 Recommends: hyperestraier
 
 Package: sisu-pdf
-Depends: sisu, tetex-bin | texlive-base-bin, tetex-extra | texlive-latex-extra,
-  texlive-latex-extra, latex-ucs
+Architecture: all
+Depends: sisu, texlive-latex-base, texlive-fonts-recommended,
+texlive-latex-recommended, texlive-latex-extra
 Suggests: evince, xpdf
 
 Package: sisu-postgresql