[SCM] qtruby packaging branch, master, updated. fad8a355a5e5d6362f43b53c0b8e2bdf2c2361db

Pino Toscano pino at alioth.debian.org
Mon Sep 26 19:09:46 UTC 2011


The following commit has been merged in the master branch:
commit fad8a355a5e5d6362f43b53c0b8e2bdf2c2361db
Author: Pino Toscano <pino at debian.org>
Date:   Mon Sep 26 21:09:18 2011 +0200

    copyright: fold two GPL-2+ licenses into one, at the end
---
 debian/copyright |   22 +++++-----------------
 1 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index dcb5373..2be86f2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,21 +5,6 @@ Source: http://projects.kde.org/projects/kde/kdebindings/ruby/qtruby
 Files: *
 Copyright: 2003-2008, Richard Dale <richard.j.dale at gmail.com>
 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/>
- .
- On Debian systems, the complete text of the GNU General Public License
- version 2 can be found in `/usr/share/common-licenses/GPL-2'.
 
 Files: cmake/*
 Copyright: 2011, Arno Rehn
@@ -190,6 +175,8 @@ Copyright: 2008-2011, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
            2011, David Palacio <dpalacio at orbitalibre.org>
            2011, Pino Toscano <pino at debian.org>
 License: GPL-2+
+
+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
@@ -203,5 +190,6 @@ License: GPL-2+
  You should have received a copy of the GNU General Public License
  along with this program. If not, see <http://www.gnu.org/licenses/>
  .
- 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 complete texts of the GNU General Public Licenses
+ version 2 and 3 can be found in `/usr/share/common-licenses/GPL-2' and
+ `/usr/share/common-licenses/GPL-3'.

-- 
qtruby packaging



More information about the pkg-kde-commits mailing list