[SCM] Calligra suite packaging branch, master, updated. debian/2.6.4-1-29-gd73172b
Adrien Grellier
adrien-guest at alioth.debian.org
Fri Aug 9 14:55:15 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=e482320
The following commit has been merged in the master branch:
commit e48232042a62d55c771217d3ebf7149b3de970c5
Author: Adrien Grellier <perso at adrieng.fr>
Date: Mon Aug 5 21:33:45 2013 +0200
debian/copyright: remove License: GPL-3
only GPL-3+ is used
---
debian/copyright | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 8e718df..a433ec7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13857,7 +13857,7 @@ License: GPL
Boston, MA 02110-1301, USA.
.
A copy of the GNU General Public License is available in
- /usr/share/common-licenses/GPL-2
+ /usr/share/common-licenses/GPL
License: GPL-2
This program is free software; you can redistribute it and/or modify
@@ -13881,21 +13881,6 @@ License: GPL-2+
A copy of the GNU General Public License is available in
/usr/share/common-licenses/GPL-2
-License: GPL-3
- Alternatively, this file may be used under the terms of the GNU Lesser
- General Public License version 2.1 as published by the Free Software
- Foundation and appearing in the file LICENSE.LGPL included in the
- packaging of this file. Please review the following information to
- ensure the GNU Lesser General Public License version 2.1 requirements
- will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
- .
- In addition, as a special exception, Nokia gives you certain additional
- rights. These rights are described in the Nokia Qt LGPL Exception
- version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
- .
- If you have questions regarding the use of this file, please contact
- Nokia at qt-info at nokia.com.
-
License: GPL-3+
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
--
Calligra suite packaging
More information about the pkg-kde-commits
mailing list