correct debian/copyright (gpl3)

1 files changed, 15 insertions, 29 deletions

diff --git a/debian/copyright b/debian/copyright
index a5907f48..c4b8eef6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,38 +1,24 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: python-leap-client
-Source: <url://example.com>
+Upstream-Name: leap-client
+Upstream-Contact: info@leap.se
+Source: <http://github.com/leapcode/leap_client/>
 
-Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: <special license>
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
- .
- <Including paragraphs>
+# FIXME !!! This needs a licensecheck -r run !!! -- kali
 
-# If you want to use GPL v2 or later for the /debian/* files use 
-# the following clauses, or change it to suit. Delete these two lines
-Files: debian/*
-Copyright: 2012 unknown <cal@croatan>
-License: GPL-2+
- This package 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 2 of the License, or
- (at your option) any later version.
- .
- This package 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/>
+Files: *
+Copyright: 2012,2013 The LEAP Encryption Access Project 
+License: GPL-3+
+ This package is released under the GNU GPL, version 3 or a later revision.
+ For further details see the COPYING file.
  .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
 
 # Please also look if there are files or directories which have a
 # different copyright/license attached and list them here.
 # Please avoid to pick license terms that are more restrictive than the
 # packaged work, as it may make Debian's contributions unacceptable upstream.
+
+# XXX TODO
+# Do we need to add the GPL OpenSSL exception??