[SCM] ices2/master: Fix properly quote licensing section GPL-2+ in copyright file (not bogusly repeat GPL-2).

js at users.alioth.debian.org js at users.alioth.debian.org
Mon Jan 3 05:07:52 UTC 2011


The following commit has been merged in the master branch:
commit 2839ec6872152b3caad920624411bef463c7427b
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Jan 3 06:06:24 2011 +0100

    Fix properly quote licensing section GPL-2+ in copyright file (not bogusly repeat GPL-2).

diff --git a/debian/copyright b/debian/copyright
index bc414de..ae0273f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -97,9 +97,15 @@ Comment:
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 License: GPL-2+
- This program is distributed under the terms of the GNU General Public
- License, version 2. You may use, modify, and redistribute it under the
- terms of this license. A copy should be included with this source.
+ 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, 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.
 Comment:
  On Debian systems, the complete text of the GNU General Public License
  (GPL) version 2 can be found in "/usr/share/common-licenses/GPL-2".

-- 
ices2 packaging



More information about the pkg-multimedia-commits mailing list