[SCM] Grantlee template engine packaging branch, master, updated. debian/0.4.0-2-9-g71f6440
Maximiliano Curia
maxy at moszumanska.debian.org
Sun Jun 14 17:32:33 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/grantlee.git;a=commitdiff;h=a508f14
The following commit has been merged in the master branch:
commit a508f14527a4be2b47f1ed1d15143c25610a2b21
Author: Maximiliano Curia <maxy at debian.org>
Date: Thu May 28 11:26:44 2015 +0200
Update copyright information.
---
debian/changelog | 1 +
debian/copyright | 131 ++++++++++++++++++++++++++++++++++++-------------------
2 files changed, 88 insertions(+), 44 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5271b10..304eb81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
grantlee (5.0.0-1~) UNRELEASED; urgency=medium
* New upstream release (5.0.0).
+ * Update copyright information.
-- Maximiliano Curia <maxy at debian.org> Thu, 28 May 2015 09:50:08 +0200
diff --git a/debian/copyright b/debian/copyright
index 8cc0da3..0e353af 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,8 @@ Upstream-Name: grantlee
Source: http://downloads.grantlee.org
Files: *
-Copyright: 2008-2011, Stephen Kelly <steveire at gmail.com>
+Copyright: 1991-1999, Free Software Foundation, Inc
+ 2008-2011, Stephen Kelly <steveire at gmail.com>
2010, Michael Jansen <kde at michael-jansen.biz>
License: LGPL-2.1+
This library is free software; you can redistribute it and/or
@@ -22,12 +23,12 @@ License: LGPL-2.1+
On Debian systems, the complete text of the GNU Lesser General Public License
version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
-Files: templates/i18n/i18nc.cpp
+Files: templates/i18n/i18n.cpp
+ templates/i18n/i18n.h
+ templates/i18n/i18nc.cpp
templates/i18n/i18nc.h
templates/i18n/i18ncp.cpp
templates/i18n/i18ncp.h
- templates/i18n/i18n.cpp
- templates/i18n/i18n.h
templates/i18n/i18np.cpp
templates/i18n/i18np.h
templates/i18n/i18ntags.cpp
@@ -52,20 +53,25 @@ License: LGPL-2+
On Debian systems, the complete text of the GNU Lesser General Public License
version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
-Files: examples/contacts/cmake/modules/FindGettext.cmake
-Copyright: 2006, Chusslove Illich <caslav.ilic at gmx.net>
-License: BSD-3-clause
+Files: examples/codegen/templates/cpp/bsd.h
+ examples/codegen/templates/py/bsd.py
+ examples/codegen/templates/rb/bsd.rb
+ scripts/extract_strings_gettext.py
+ scripts/extract_strings_linguist.py
+ scripts/strings_extractor_gettext.py
+ scripts/strings_extractor_linguist.py
+ scripts/updatelicence.py
+Copyright: 2010-2011 Stephen Kelly <steveire at gmail.com>
+License: BSD-2-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
.
- 1. Redistributions of source code must retain the copyright
+ 1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the copyright
+ 2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -84,12 +90,8 @@ Files: examples/books/bookdelegate.cpp
examples/books/bookwindow.h
examples/books/initdb.h
examples/books/main.cpp
- examples/textedit/main.cpp
- examples/textedit/textedit.cpp
- examples/textedit/textedit.h
- examples/textedit/textedit.qdoc
Copyright: 2009, Nokia Corporation and/or its subsidiary(-ies)
-License: LGPL-2+ | GPL-3+
+License: GPL-3 or LGPL-2.1-QTexception-1.0
No Commercial Usage
This file contains pre-release code and may not be distributed.
You may use this file in accordance with the terms and conditions
@@ -126,45 +128,64 @@ License: LGPL-2+ | GPL-3+
On Debian systems, the complete text of the GNU General Public License
version 3 can be found in `/usr/share/common-licenses/GPL-3'.
-Files: examples/htmlapps/templates/shared/jquery-2.0.3.js
-Copyright: 2005, 2013 jQuery Foundation, Inc. and other contributors
-License: MIT
- 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
- without limitation the rights to use, copy, modify, merge, publish,
- 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:
+Files: examples/textedit/main.cpp
+ examples/textedit/textedit.cpp
+ examples/textedit/textedit.h
+ examples/textedit/textedit.qdoc
+Copyright: 2010, Nokia Corporation and/or its subsidiary(-ies)
+License: GPL-3 or LGPL-2.1-QTexception-1.1
+ Commercial Usage
+ Licensees holding valid Qt Commercial licenses may use this file in
+ accordance with the Qt Commercial License Agreement provided with the
+ Software or, alternatively, in accordance with the terms contained in
+ a written agreement between you and Nokia.
.
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
+ GNU Lesser General Public License Usage
+ 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.
.
- 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. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY 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.
+ 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.
+ .
+ GNU General Public License Usage
+ Alternatively, this file may be used under the terms of the GNU
+ General Public License version 3.0 as published by the Free Software
+ Foundation and appearing in the file LICENSE.GPL included in the
+ packaging of this file. Please review the following information to
+ ensure the GNU General Public License version 3.0 requirements will be
+ met: http://www.gnu.org/copyleft/gpl.html.
+ .
+ If you have questions regarding the use of this file, please contact
+ Nokia at qt-info at nokia.com.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 3 can be found in `/usr/share/common-licenses/GPL-3'.
-Files: scripts/extract_strings_gettext.py
- scripts/extract_strings_linguist.py
- scripts/strings_extractor_gettext.p
- scripts/strings_extractor_linguist.py
+Files: examples/contacts/cmake/modules/FindGettext.cmake
scripts/strings_extractor.py
- scripts/updatelicence.py
-Copyright: 2010-2011 Stephen Kelly <steveire at gmail.com>
-License: BSD-2-clause
+Copyright: 2006, Chusslove Illich <caslav.ilic at gmx.net>
+ Django Software Foundation and individual contributors
+ 2010-2011, Stephen Kelly <steveire at gmail.com>
+License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
.
- 1. Redistributions of source code must retain the above copyright
+ 1. Redistributions of source code must retain the copyright
notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
+ 2. Redistributions in binary form must reproduce the copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -177,6 +198,28 @@ License: BSD-2-clause
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Files: examples/htmlapps/templates/shared/jquery-2.0.3.js
+Copyright: 2005, 2013 jQuery Foundation, Inc. and other contributors
+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
+ without limitation the rights to use, copy, modify, merge, publish,
+ 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. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY 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, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
License: GPL-2
--
Grantlee template engine packaging
More information about the pkg-kde-commits
mailing list