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

16 files changed, 111 insertions, 132 deletions

diff --git a/debian/NEWS b/debian/NEWS.Debian
index b1ceed7f..b1ceed7f 100644
--- a/debian/NEWS
+++ b/debian/NEWS.Debian
diff --git a/debian/changelog b/debian/changelog
index de57ead1..9b42500f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+sisu (0.70.5-1) unstable; urgency=low
+
+  * new minor upstream release, see upstream changelog
+
+  * debian/ new year cleaning:
+    * debian/copyright use parse-able format;
+    * debian/rules cleanup;
+    * debian/control fcgi-ruby made a dependency for sisu-postgresql and
+      sisu-sqlite as sample script needs it, git repo move noted, package
+      description touched;
+    * removed sisu.postrm, forced removal on purge /etc/sisu draconian if
+      it contains admin edits
+    * minor sorting
+
+  * note git repo moved:
+    <http://git.sisudoc.org/?p=code/sisu.git;a=summary>
+
+ -- Ralph Amissah <ralph@amissah.com>  Sun, 18 Jan 2009 00:38:58 -0400
+
 sisu (0.70.4-1) unstable; urgency=medium
 
   * new upstream, see upstream changelog, sisu-pdf, workaround necessitated by
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.
diff --git a/debian/copyright b/debian/copyright
index 844aa839..bb85146f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,68 +1,41 @@
-This is sisu, written and maintained by Ralph Amissah <ralph@amissah.com>
-on Mon, 2 May 2005 17:33:58 +0100.
-
-The homepage is:
-  <http://www.jus.uio.no/sisu>
-
-The original source can always be found at:
-  <http://www.jus.uio.no/sisu/SiSU/download>
-  <http://www.jus.uio.no/sisu/pkg/src>
-
-License: GPL 3 or later:
-
-  SiSU, a framework for document structuring, publishing and search
-
-  Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007, 2008 Ralph Amissah
-
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by the Free
-  Software Foundation, either version 3 of the License, or (at your option)
-  any later version.
-
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program. If not, see <http://www.gnu.org/licenses/>.
-
-  If you have Internet connection, the latest version of the GPL should be
-  available at these locations:
-   <http://www.fsf.org/licensing/licenses/gpl.html>
-   <http://www.gnu.org/licenses/gpl.html>
-
-   <http://www.jus.uio.no/sisu/gpl.fsf/toc.html>
-   <http://www.jus.uio.no/sisu/gpl.fsf/doc.html>
-   <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt>
-
-  On Debian systems, the complete text of the GNU General
-  Public License can be found in '/usr/share/common-licenses/GPL'.
-
-  The Free Software Foundation:
-    <http://www.fsf.org/>
-
-For installation purposes the SiSU tarball includes:
-
-setup.rb by Minero Aoki
-
-Hompepage:
-  <http://i.loveruby.net/en/projects/setup/>
-
-License:
-  LGPL
-
-and
-
-sisu-install, an installer generated by
-Rant which is by Stefan Lang
-
-Homepage:
-  <http://make.rubyforge.org/>
-
-License:
-  LGPL
-
-NB: Rant is not included in the SiSU tarball, and is not itself required for
-    the Rant generated install file to work, (ruby will suffice)
+Author: Ralph Amissah <ralph@amissah.com>
+Download: http://www.jus.uio.no/sisu/
+
+Files: *
+Copyright: (C) 1997-2009 Ralph Amissah
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
+
+Files: setup.rb
+Copyright: Minero Aoki <http://i.loveruby.net/en/projects/setup/>
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU Library General Public License
+ can be found in /usr/share/common-licenses/LGPL-2 file.
diff --git a/debian/man/man7/sisu_complete.7 b/debian/manpages/sisu_complete.7
index f41a4154..f41a4154 100644
--- a/debian/man/man7/sisu_complete.7
+++ b/debian/manpages/sisu_complete.7
diff --git a/debian/man/man7/sisu_pdf.7 b/debian/manpages/sisu_pdf.7
index 7149f340..7149f340 100644
--- a/debian/man/man7/sisu_pdf.7
+++ b/debian/manpages/sisu_pdf.7
diff --git a/debian/man/man7/sisu_postgresql.7 b/debian/manpages/sisu_postgresql.7
index 0c780e79..0c780e79 100644
--- a/debian/man/man7/sisu_postgresql.7
+++ b/debian/manpages/sisu_postgresql.7
diff --git a/debian/man/man7/sisu_sqlite.7 b/debian/manpages/sisu_sqlite.7
index 2b738c54..2b738c54 100644
--- a/debian/man/man7/sisu_sqlite.7
+++ b/debian/manpages/sisu_sqlite.7
diff --git a/debian/rules b/debian/rules
index 5c3307d7..1465b319 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,33 +1,26 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE=1
-
-build:
 
 clean:
 	dh_testdir
 	dh_testroot
 	dh_clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	# Installing lintian overrides
-	for lintian in debian/lintian/*; \
-	do \
-		install -D -m 644 $$lintian debian/`basename $$lintian`/usr/share/lintian/overrides/`basename $$lintian` || exit 1; \
-	done
+build:
+
+install:
+
+binary: binary-indep
 
-binary-arch: build install
+binary-arch:
 
-binary-indep: build install
+binary-indep:
 	dh_testdir
 	dh_testroot
 	dh_installdocs README
 	dh_installchangelogs CHANGELOG
 	dh_installman
 	dh_install
+	dh_lintian
 	dh_compress -X.rb -X.ssi -X.ssm -X.sst -X.yml
 	dh_fixperms
 	dh_installdeb
@@ -35,5 +28,4 @@ binary-indep: build install
 	dh_md5sums
 	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: clean build install binary-indep binary-arch binary
+.PHONY: clean build install binary binary-arch binary-indep
diff --git a/debian/sisu-complete.manpages b/debian/sisu-complete.manpages
index 3c05679f..12ce4164 100644
--- a/debian/sisu-complete.manpages
+++ b/debian/sisu-complete.manpages
@@ -1 +1 @@
-debian/man/man7/sisu_complete.7
+debian/manpages/sisu_complete.7
diff --git a/debian/sisu-pdf.manpages b/debian/sisu-pdf.manpages
index d84a5424..887d0e69 100644
--- a/debian/sisu-pdf.manpages
+++ b/debian/sisu-pdf.manpages
@@ -1 +1 @@
-debian/man/man7/sisu_pdf.7
+debian/manpages/sisu_pdf.7
diff --git a/debian/sisu-postgresql.manpages b/debian/sisu-postgresql.manpages
index 570f11a8..b016948b 100644
--- a/debian/sisu-postgresql.manpages
+++ b/debian/sisu-postgresql.manpages
@@ -1 +1 @@
-debian/man/man7/sisu_postgresql.7
+debian/manpages/sisu_postgresql.7
diff --git a/debian/sisu-sqlite.manpages b/debian/sisu-sqlite.manpages
index 502b5b18..7fe63c75 100644
--- a/debian/sisu-sqlite.manpages
+++ b/debian/sisu-sqlite.manpages
@@ -1 +1 @@
-debian/man/man7/sisu_sqlite.7
+debian/manpages/sisu_sqlite.7
diff --git a/debian/sisu.install b/debian/sisu.install
index 8004b909..eeb563a0 100644
--- a/debian/sisu.install
+++ b/debian/sisu.install
@@ -1,16 +1,19 @@
-bin/ usr
-lib/sisu/ usr/lib/ruby/1.8
-#lib/sisu/ usr/lib/ruby/1.9.0
-conf/sisu etc
-data/sisu usr/share
-data/doc/sisu usr/share/doc
-debian/data/sisu_markup_samples usr/share/doc/sisu
-#% depreciated remove once vim-addon-manager is in place
-data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim usr/share/vim/addons/ftplugin
-data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim usr/share/vim/addons/syntax
-#% migrate to use vim-addon-manager
-data/sisu/conf/editor-syntax-etc/vim/vim-sisu.yaml usr/share/vim/registry
-data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim usr/share/vim-scripts/ftplugin
-data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim usr/share/vim-scripts/syntax
-#% installation of kate (and kde) is optional
-#data/sisu/conf/editor-syntax-etc/kate/sisu.xml usr/share/apps/katepart/syntax
+bin							/usr
+lib/sisu						/usr/lib/ruby/1.8
+#lib/sisu						/usr/lib/ruby/1.9.0
+conf/sisu						/etc
+data/sisu						/usr/share
+data/doc/sisu						/usr/share/doc
+debian/data/sisu_markup_samples				/usr/share/doc/sisu
+
+# depreciated remove once vim-addon-manager is in place
+data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim	/usr/share/vim/addons/ftplugin
+data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim	/usr/share/vim/addons/syntax
+
+# migrate to use vim-addon-manager
+data/sisu/conf/editor-syntax-etc/vim/vim-sisu.yaml	/usr/share/vim/registry
+data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim	/usr/share/vim-scripts/ftplugin
+data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim	/usr/share/vim-scripts/syntax
+
+# installation of kate (and kde) is optional
+#data/sisu/conf/editor-syntax-etc/kate/sisu.xml		/usr/share/apps/katepart/syntax
diff --git a/debian/lintian/sisu b/debian/sisu.lintian-overrides
index b47a8f57..ea81a7d8 100644
--- a/debian/lintian/sisu
+++ b/debian/sisu.lintian-overrides
@@ -1,3 +1,4 @@
+# too long URLs
 sisu: manpage-has-errors-from-man
 sisu: script-not-executable ./usr/share/sisu/conf/convert/kdissert_to_sisu
 sisu: script-not-executable ./usr/share/sisu/conf/convert/sisu_convert
diff --git a/debian/sisu.postrm b/debian/sisu.postrm
deleted file mode 100644
index 97906436..00000000
--- a/debian/sisu.postrm
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh -e
-if [ "$1" = purge ] ; then
-  rm -rf /etc/sisu
-fi
-#DEBHELPER#