[Python-modules-commits] r16881 - in packages/preprocess/trunk/debian (copyright)

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

    Date: Tuesday, May 3, 2011 @ 11:22:30
  Author: johannr-guest
Revision: 16881

Collate files with same author+license and add GPL grant.

Modified:
  packages/preprocess/trunk/debian/copyright

Modified: packages/preprocess/trunk/debian/copyright
===================================================================
--- packages/preprocess/trunk/debian/copyright	2011-05-03 10:08:52 UTC (rev 16880)
+++ packages/preprocess/trunk/debian/copyright	2011-05-03 11:22:30 UTC (rev 16881)
@@ -6,6 +6,42 @@
 Files: *
 Copyright: 2002-2005 ActiveState Corp.
 License: Expat
+
+Files: debian/*
+Copyright: 2010-2011 Johannes Ring <johannr at simula.no>
+License: GPL-2+
+ This program 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 program 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 Foobar.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems the full text of the GNU General Public License
+ can be found in the file '/usr/share/common-licenses/GPL-2'.
+
+Files: test/test_preprocess_inputs.py
+ src/exe/launcher.cpp
+ test/test_preprocess.py
+Copyright: 2002 Trent Mick <TrentM at ActiveState.com>
+ 2002-2008 Trent Mick <TrentM at ActiveState.com>
+License: Expat
+
+Files: test/testlib.py
+ test/test.py
+ lib/preprocess.py
+Copyright: 2000-2008 ActiveState Software Inc.
+ 2005-2006 ActiveState Software Inc.
+ 2002-2008 ActiveState Software Inc.
+License: Expat
+
+License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the
  "Software"), to deal in the Software without restriction, including
@@ -13,10 +49,10 @@
  distribute, sublicense, and/or sell copies of the Software, and to
  permit persons to whom the Software is furnished to do so, subject to
  the following conditions:
-
+ .
  The above copyright notice and this permission notice shall be included
  in all copies or substantial portions of the Software.
-
+ .
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -24,33 +60,3 @@
  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Files: debian/*
-Copyright: 2010-2011 Johannes Ring <johannr at simula.no>
-License: GPL-2+
- On Debian systems the full text of the GNU General Public License
- can be found in the '/usr/share/common-licenses/GPL-2' file.
-
-Files: test/testlib.py
-Copyright: 2000-2008 ActiveState Software Inc.
-License: Expat
-
-Files: test/test_preprocess_inputs.py
-Copyright: 2002-2008 Trent Mick <TrentM at ActiveState.com>
-License: Expat
-
-Files: test/test_preprocess.py
-Copyright: 2002 Trent Mick <TrentM at ActiveState.com>
-License: Expat
-
-Files: test/test.py
-Copyright: 2005-2006 ActiveState Software Inc.
-License: Expat
-
-Files: src/exe/launcher.cpp
-Copyright: 2002 Trent Mick <TrentM at ActiveState.com>
-License: Expat
-
-Files: lib/preprocess.py
-Copyright: 2002-2008 ActiveState Software Inc.
-License: Expat