[SCM] Packaging of padre perl editor branch, master, updated. debian/0.92.ds1-1-6-ge07c145

Dominique Dumont dod at debian.org
Sun Jan 22 17:26:38 UTC 2012


The following commit has been merged in the master branch:
commit e07c1456cc79bcf0ce8ed690cd9685df4a53a833
Author: Dominique Dumont <dod at debian.org>
Date:   Sun Jan 22 18:26:30 2012 +0100

    debian/copyright: fixed DEP-5 syntax errors

diff --git a/debian/copyright b/debian/copyright
index afadfd8..619d9c5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -80,43 +80,32 @@ Copyright: 2008-2011 The Padre development team as listed in Padre.pm
     Kjetil Skotheim (KJETIL)
     Oren Maurer <meorero at gmail.com>
     Pásztor György <pasztor at linux.gyakg.u-szeged.hu>
-License: Perl
- The Padre source code is distributed under the same terms as Perl itself.
+License: Artistic or GPL-1+
 
 Files: lib/Padre/DB/Snippets.pod
 Copyright: 2009 - 2010 Adam Kennedy
-License: Perl
- This program is free software; you can redistribute it and/or modify it under·
- the same terms as Perl itself
+License: Artistic or GPL-1+
 
 Files: lib/Wx/Perl/Dialog/Simple.pm
 Copyright: Copyright 2008 Gábor Szabó. L<http://www.szabgab.com/>
-License: Perl
- This program is free software; you can redistribute it and/or modify it under·
- the same terms as Perl itself
+License: Artistic or GPL-1+
 
 Files: share/examples/wx/40_draw.pl
        share/examples/wx/41-drag-image.pl
        share/examples/wx/42-drag-image-no-tail.pl
 Copyright: (c) 2001, 2003, 2005-2006 Mattia Barbon
-Licence: Perl
- This program is free software; you can redistribute it and/or modify it under 
- the same terms as Perl itself
+Licence: Artistic or GPL-1+
 
 Files: share/doc/perlopquick/perlopquick.pod
 Copyright: perlopquick is Copyright (C) 2010 by Chas. Owens and contains some
  text from the Perl POD documentation which is Copyright (C) 1993, 1994, 1995,
  1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
  2009 by Larry Wall and others.  All rights reserved.
-License: Perl
- You can redistribute and/or modify the icons under the same terms as Perl 
- itself.
+License: Artistic or GPL-1+
 
 Files: share/padre-splash.bmp
 Copyright: 2009 Ahmad M. Zawawi
-License: Perl
- You can redistribute and/or modify the icons under the same terms as Perl 
- itself.
+License: Artistic or GPL-1+
 
 Files: share/icons/gnome218/*
 X-Note: these icons are taken from gnome-icon-theme 2.18.
@@ -132,15 +121,11 @@ License: GPL-2
 
 Files: share/icons/padre/16x16/status/*
 Copyright: Copyright 2008 Steffen Mueller.
-License: Perl
- You can redistribute and/or modify the icons under the same terms as Perl
- itself.
+License: Artistic or GPL-1+
 
 Files: share/icons/padre/16x16/actions/toggle-comments.png
 Copyright: Copyright 2009 Breno G. de Oliveira.
-License: Perl
- You can redistribute and/or modify the icons under the same terms as Perl 
- itself.
+License: Artistic or GPL-1+
 
 Files: share/icons/padre/16x16/actions/x-document-close.png
 Note: Taken from the KDE4 Oxygen theme actions/application-exit.
@@ -321,7 +306,7 @@ License: CC-SA-3.0
     Licensor hereby grants You a worldwide, royalty-free, non-exclusive, 
     perpetual (for the duration of the applicable copyright) license to 
     exercise the rights in the Work as stated below:
-
+ .
     a. to Reproduce the Work, to incorporate the Work into one or more 
        Collections, and to Reproduce the Work as incorporated in the 
        Collections;
@@ -525,31 +510,20 @@ License: CC-SA-3.0
 
 Files: t/collection/Config-Tiny/*
 Copyright: Copyright 2002 - 2007 Adam Kennedy.
-License: Perl
- This program is free software; you can redistribute
- it and/or modify it under the same terms as Perl itself.
+License: Artistic or GPL-1+
 
 Files: inc/Module/Install/*
-Copyright: Copyright 2002 - 2010 by Brian Ingerson, Audrey Tang and Adam 
-Kennedy
-License: Perl
+Copyright: Copyright 2002 - 2010 by Brian Ingerson, Audrey Tang and Adam Kennedy
+License: Artistic or GPL-1+
 
 Files: inc/Module/Install/PRIVATE/*
        privinc/*
 Copyright: 2008-2010 The Padre development team as listed in Padre.pm.
-License: Perl
+License: Artistic or GPL-1+
 
 Files: debian/*
-Copyright: © 2008-2010, Damyan Ivanov <dmn at debian.org>
-License: Perl
- Padre packaging is free software; you can redistribute
- it and/or modify it under the same terms as Perl itself.
-
-
-License-Alias: Perl
-Lcenses: Artistic | GPL+1
- This program is free software; you can redistribute it and/or 
- modify it under the same terms as Perl itself.
+Copyright: 2008-2010, Damyan Ivanov <dmn at debian.org>
+License: Artistic or GPL-1+
 
 License: Artistic
     This program is free software; you can redistribute it and/or modify

-- 
Packaging of padre perl editor



More information about the Pkg-perl-cvs-commits mailing list