sisu-0.70.5, merge branch upstream into debian/sid; debian/ new year cleaningdebian/0.70.5-1

* debian/control:
  add depends for fcgi-ruby in sisu-postgresql and sisu-sqlite;
  package description;
  git repo move noted
* debian/rules: clean/tidy
* debian/copyright: use machine parseable format
* removed sisu.postrm, forced removal on purge /etc/sisu draconian if it
  contains admin edits
* minor sorting
* debian/changelog for 0.70.5

1 files changed, 18 insertions, 22 deletions

diff --git a/debian/control b/debian/control
index c9a0d1d5..a3e8c1c2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,16 @@ Source: sisu
 Section: text
 Priority: optional
 Maintainer: Ralph Amissah <ralph@amissah.com>
-XS-Dm-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7)
 Standards-Version: 3.8.0
-Vcs-Git: git://sisudoc.org/git/sisu
-Vcs-Browser: http://search.sisudoc.org/cgi-bin/gitweb.cgi?p=sisu;a=summary
-Homepage: http://www.jus.uio.no/sisu
+Homepage: http://www.jus.uio.no/sisu/
+Vcs-Browser: http://git.sisudoc.org/?p=code/sisu.git
+Vcs-Git: git://git.sisudoc.org/git/code/sisu.git
+XS-Dm-Upload-Allowed: yes
 
 Package: sisu
 Architecture: all
 Depends: ruby (>= 1.8.2), libwebrick-ruby, rsync, unzip, zip
-Conflicts: vim-sisu, sisu-vim, sisu-remote, sisu-doc
-Replaces: vim-sisu, sisu-vim, sisu-doc
 Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, hyperestraier, keychain, librmagick-ruby, librexml-ruby, openssl, openssh-client | lsh-client, tidy, vim-addon-manager
 Suggests: kdissert, lv, rcs | cvs, pinfo, texinfo, trang
 Description: documents - structuring, publishing in multiple formats and search
@@ -55,31 +53,33 @@ Architecture: all
 Depends: ruby (>= 1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-sqlite
 Recommends: hyperestraier
 Description: installs all SiSU related packages
- This package installs SiSU and related packages that enable sisu to produce
- pdf and to populate PostgreSQL and sqlite databases.
- .
  SiSU is a lightweight markup based document structuring, publishing and search
  framework for document collections.
  .
+ This package installs SiSU and related packages that enable sisu to produce
+ pdf and to populate PostgreSQL and sqlite databases.
+ .
  See sisu for a description of the package.
 
 Package: sisu-pdf
 Architecture: all
 Depends: sisu, texlive-latex-base, texlive-fonts-recommended, texlive-latex-recommended, texlive-latex-extra
 Recommends: texlive-xetex
-Suggests: evince | xpdf | kpdf
+Suggests: evince | kpdf | xpdf
 Description: dependencies to convert SiSU LaTeX output to pdf
- This package enables the conversion of SiSU LaTeX output to pdf.
- .
  SiSU is a lightweight markup based document structuring, publishing and search
  framework for document collections.
+ .
+ This package enables the conversion of SiSU LaTeX output to pdf.
 
 Package: sisu-postgresql
 Architecture: all
-Depends: sisu, libdbd-pg-ruby, libdbd-pg-ruby1.8, libdbi-ruby, libdbi-ruby1.8, libdbm-ruby, postgresql
-Recommends: libfcgi-ruby
+Depends: sisu, libdbd-pg-ruby, libdbd-pg-ruby1.8, libdbi-ruby, libdbi-ruby1.8, libdbm-ruby, postgresql, libfcgi-ruby1.8 | libfcgi-ruby1.9
 Suggests: postgresql-contrib
 Description: SiSU dependencies for use with PostgreSQL database
+ SiSU is a lightweight markup based document structuring, publishing and search
+ framework for document collections.
+ .
  This package enables SiSU to populate a PostgreSQL database. This is done at
  an object/paragraph level, making granular searches of documents possible.
  .
@@ -88,15 +88,14 @@ Description: SiSU dependencies for use with PostgreSQL database
  for matching units of text, primarily paragraphs that can be displayed or
  identified by object citation number, from which an index of documents
  matched and each matched paragraph within them can be displayed.
- .
- SiSU is a lightweight markup based document structuring, publishing and search
- framework for document collections.
 
 Package: sisu-sqlite
 Architecture: all
-Depends: sisu, sqlite3, libsqlite3-ruby, libdbd-sqlite3-ruby, libdbd-sqlite3-ruby1.8, libdbi-ruby, libdbi-ruby1.8, libdbm-ruby
-Recommends: libfcgi-ruby
+Depends: sisu, sqlite3, libsqlite3-ruby, libdbd-sqlite3-ruby, libdbd-sqlite3-ruby1.8, libdbi-ruby, libdbi-ruby1.8, libdbm-ruby, libfcgi-ruby1.8 | libfcgi-ruby1.9
 Description: SiSU dependencies for use with SQLite database
+ SiSU is a lightweight markup based document structuring, publishing and search
+ framework for document collections.
+ .
  This package enables SiSU to populate an SQLite database. This is done at an
  object/paragraph level, making granular searches of documents possible.
  .
@@ -105,6 +104,3 @@ Description: SiSU dependencies for use with SQLite database
  for matching units of text, primarily paragraphs that can be displayed or
  identified by object citation number, from which an index of documents
  matched and each matched paragraph within them can be displayed.
- .
- SiSU is a lightweight markup based document structuring, publishing and search
- framework for document collections.