[Python-apps-commits] r5825 - in packages/pyrit/trunk/debian (copyright)

[chrisk-guest at users.alioth.debian.org]

    Date: Friday, July 16, 2010 @ 22:59:21
  Author: chrisk-guest
Revision: 5825

Restructure/simplify changelog

Modified:
  packages/pyrit/trunk/debian/copyright

Modified: packages/pyrit/trunk/debian/copyright
===================================================================
--- packages/pyrit/trunk/debian/copyright	2010-07-15 08:11:21 UTC (rev 5824)
+++ packages/pyrit/trunk/debian/copyright	2010-07-16 22:59:21 UTC (rev 5825)
@@ -5,40 +5,16 @@
 
 Copyright: 2008-2010, Lukas Lueg <lukas.lueg at gmail.com>
 License: GPL-3+ with OpenSSL exception
- 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 3 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 package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- .
- Additional permission under GNU GPL version 3 section 7
- .
- OpenSSL linking exception
- --------------------------
- If you modify this Program, or any covered work, by linking or
- combining it with the OpenSSL project's "OpenSSL" library (or a
- modified version of that library), containing parts covered by
- the terms of OpenSSL/SSLeay license, the licensors of this
- Program grant you additional permission to convey the resulting
- work. Corresponding Source for a non-source form of such a
- combination shall include the source code for the parts of the
- OpenSSL library used as well as that of the covered work.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in
- `/usr/share/common-licenses/GPL-3'.
 
 Files: debian/*
 Copyright: 2010, Christian Kastner <debian at kvr.at>
 License: GPL-3+
+
+Files: debian/patches/*
+Copyright: 2010, Christian Kastner <debian at kvr.at>
+License: GPL-3+ with OpenSSL exception
+
+License: GPL-3+
  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 3 of the License, or
@@ -57,15 +33,13 @@
  Public License version 3 can be found in
  `/usr/share/common-licenses/GPL-3'.
 
-Files: debian/patches/*
-Copyright: 2010, Christian Kastner <debian at kvr.at>
 License: GPL-3+ with OpenSSL exception
- This Program is free software; you can redistribute it and/or modify
+ 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 3 of the License, or
  (at your option) any later version.
  .
- This Program is distributed in the hope that it will be useful,
+ 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.