Fix debian/copyright

diff --git a/debian/changelog b/debian/changelog
index 3d1caa34c9f6f3a5ce6ee760b757b518ce82db51..8b5f25d67efc9277291ef85902d57b255095e342 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 roundcube (0.1.1-4) UNRELEASED; urgency=low
 
   * Add Slovak debconf translation, thanks to Ivan Masár (Closes: #481376)
+  * Fix debian/copyright:
+     + RoundCube is GPL-2 licensed, not GPL-2+
+     + Add an explanation on the BSD license present at the top of
+       index.php (Closes: #477119)
 
- -- Vincent Bernat <bernat@debian.org>  Thu, 15 May 2008 20:23:37 +0200
+ -- Vincent Bernat <bernat@debian.org>  Fri, 16 May 2008 21:49:38 +0200
 
 roundcube (0.1.1-3) unstable; urgency=low
 

diff --git a/debian/copyright b/debian/copyright
index 82c322eb9750f301b441bed0a995b728b9a88096..48995a560c0e5fb6381295d5b2e61570eb22b9ca 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,9 +7,14 @@ Copyright: 2005-2006, RoundCube Dev. - Switzerland
 
 License: GPL
 
-RoundCube may be redistributed under the terms of the GNU GPL,
-Version 2 or later, found on Debian systems in the file 
-/usr/share/common-licenses/GPL
+RoundCube may be redistributed under the terms of the GNU GPL, Version
+2, found on Debian systems in the file /usr/share/common-licenses/GPL
+
+The file index.php incorrectly states that it is BSD licensed. This
+was a mistake and this was changed in SVN:
+ http://trac.roundcube.net/browser/trunk/roundcubemail/index.php
+More info here:
+ http://lists.roundcube.net/mail-archive/dev/2008-05/0000015.html
 
 Some files are taken from other projects :
  - googiespell from amix@amix.dk, MIT license