Remove old mention from debian/copyright. The remaining of the file

[roundcube.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 48995a560c0e5fb6381295d5b2e61570eb22b9ca..977fd0dbac9397ca479a70b2652d84c91e9c9240 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,13 +8,7 @@ Copyright: 2005-2006, RoundCube Dev. - Switzerland
 License: GPL
 
 RoundCube may be redistributed under the terms of the GNU GPL, Version
 License: 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
+2, found on Debian systems in the file /usr/share/common-licenses/GPL-2

 
 Some files are taken from other projects :
  - googiespell from amix@amix.dk, MIT license
 
 Some files are taken from other projects :
  - googiespell from amix@amix.dk, MIT license


@@ -22,11 +16,12 @@ Some files are taken from other projects :
  - lib/{enriched,icl_commons,imap,mime,utf7}.inc from IlohaMail project, GPL license
  - lib/encoding/*.map from Unicode, Inc., with "BSD-lite" license
  - debian/patches/xss-fix.patch contains code from Squirrelmail, GPLv2
  - lib/{enriched,icl_commons,imap,mime,utf7}.inc from IlohaMail project, GPL license
  - lib/encoding/*.map from Unicode, Inc., with "BSD-lite" license
  - debian/patches/xss-fix.patch contains code from Squirrelmail, GPLv2

+ - program/js/jquery-1.3.min.js is MIT and GPLv2 licensed

  - lib/magic is an autogenerated file. We don't ship it and use the
    one from libmagic1 instead. Here is the license:
 
  - lib/magic is an autogenerated file. We don't ship it and use the
    one from libmagic1 instead. Here is the license:
 

-       Copyright (C) 1985-1995 Ian F. Darwin
-       Copyright (C) 1994-2008 Christos Zoulas <christos@zoulas.com>
+       Copyright © 1985-1995 Ian F. Darwin
+       Copyright © 1994-2008 Christos Zoulas <christos@zoulas.com>

 
        This software is not subject to any export provision of the United
        States Department of Commerce, and may be exported to any country or
 
        This software is not subject to any export provision of the United
        States Department of Commerce, and may be exported to any country or


@@ -58,6 +53,6 @@ Some files are taken from other projects :
 
 All other licenses can be found in the corresponding source file.
 
 
 All other licenses can be found in the corresponding source file.
 

-The Debian packaging is (C) 2007, Vincent Bernat <bernat@luffy.cx> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is © 2007, Vincent Bernat <bernat@luffy.cx> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.