Merge branch 'upstream' into debian/sid

1 files changed, 22 insertions, 24 deletions

diff --git a/data/doc/sisu/copyright b/data/doc/sisu/copyright
index c15699c4..6b129a77 100644
--- a/data/doc/sisu/copyright
+++ b/data/doc/sisu/copyright
@@ -8,33 +8,31 @@ The original source can always be found at:
 	<http://www.jus.uio.no/sisu/SiSU/download>
 	<http://www.jus.uio.no/sisu/pkg/src>
 
-Copyright (C) 1997, 1998, 1999, 2000, 20001, 2002, 2003, 2004, 2005
-Ralph Amissah
+License: GPL 3 or later:
 
-License: GPL v3 or later
+  SiSU, a framework for document structuring, publishing and search
 
-  GPL3 summary:
+  Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007 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 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.
+  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 package; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-  MA 02110-1301, USA
+  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 from these locations:
-    <http://www.fsf.org/licenses/gpl.html>
-    <http://www.gnu.org/copyleft/gpl.html>
-    <http://www.jus.uio.no/sisu/gpl3.fsf>
+  available at these locations:
+  <http://www.fsf.org/licenses/gpl.html>
+  <http://www.gnu.org/copyleft/gpl.html>
+  <http://www.jus.uio.no/sisu/gpl.fsf>
 
   On Debian systems, the complete text of the GNU General
   Public License can be found in `/usr/share/common-licenses/GPL'.
@@ -42,7 +40,7 @@ License: GPL v3 or later
   The Free Software Foundation:
     <http://www.fsf.org/>
 
-For installation purposes the SiSU tarball includes
+For installation purposes the SiSU tarball includes:
 
 setup.rb by Minero Aoki
 
@@ -52,9 +50,9 @@ Hompepage:
 License:
   LGPL
 
-and 
+and
 
-install, an installer generated by
+sisu-install, an installer generated by
 Rant which is by Stefan Lang
 
 Homepage:
@@ -64,4 +62,4 @@ License:
   LGPL
 
 NB: Rant is not included in the SiSU tarball, and is not itself required for
-    the Rant generated install file to work
+    the Rant generated install file to work, (ruby will suffice)