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, 41 insertions, 68 deletions

diff --git a/data/doc/sisu/copyright b/data/doc/sisu/copyright
index 844aa839..84e8f311 100644
--- a/data/doc/sisu/copyright
+++ b/data/doc/sisu/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.