Fix debian/copyright to make lintian happy.

diff --git a/debian/changelog b/debian/changelog
index 0460688740ccf082ff93beb830036c08462ad023..8e65e4019fcb8e967867f8c179b70236c6e65d70 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ roundcube (0.2~stable-1) unstable; urgency=low
   * Fix pending l10n issues:
       + Update English debconf template. Closes: #473794.
       + Add Swedish translation thanks to Martin Bagge. Closes: #508752.
+  * Fix debian/copyright to make lintian happy.
 
  -- Vincent Bernat <bernat@debian.org>  Sun, 15 Feb 2009 16:18:58 +0100
 

diff --git a/debian/control b/debian/control
index b40f1f47dcce1e9dc0e2ad302c6303bfa1f7b9f0..a3f90b872a0db13145fc62babd89baafd9667429 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Description: skinnable AJAX based webmail solution for IMAP servers
 Package: roundcube
 Architecture: all
 Depends: roundcube-sqlite | roundcube-db, roundcube-core (= ${source:Version}), ${misc:Depends}
-Description: skinnable AJAX based webmail solution for IMAP servers
+Description: skinnable AJAX based webmail solution for IMAP servers - metapackage
  RoundCube Webmail is a browser-based multilingual IMAP client with an
  application-like user interface. It provides full functionality
  expected from an e-mail client, including MIME support, address book,

diff --git a/debian/control.in b/debian/control.in
index c583a16cf95685c2388d7d076e9286be692762c9..d59c7d16d1d1895fba8800070711d2c95f2eb61a 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -28,7 +28,7 @@ Description: skinnable AJAX based webmail solution for IMAP servers
 Package: roundcube
 Architecture: all
 Depends: roundcube-sqlite | roundcube-db, roundcube-core (= ${source:Version}), ${misc:Depends}
-Description: skinnable AJAX based webmail solution for IMAP servers
+Description: skinnable AJAX based webmail solution for IMAP servers - metapackage
  RoundCube Webmail is a browser-based multilingual IMAP client with an
  application-like user interface. It provides full functionality
  expected from an e-mail client, including MIME support, address book,

diff --git a/debian/copyright b/debian/copyright
index 48995a560c0e5fb6381295d5b2e61570eb22b9ca..2518c53e5820492ed26627edda4f1f1035c1e65d 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,7 @@ Copyright: 2005-2006, RoundCube Dev. - Switzerland
 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
+2, found on Debian systems in the file /usr/share/common-licenses/GPL-2
 
 The file index.php incorrectly states that it is BSD licensed. This
 was a mistake and this was changed in SVN:
@@ -25,8 +25,8 @@ Some files are taken from other projects :
  - 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
@@ -58,6 +58,6 @@ Some files are taken from other projects :
 
 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'.