[SCM] Grantlee template engine packaging branch, master, updated. debian/0.3.0-5-8-geed6cca

Pino Toscano pino at moszumanska.debian.org
Sun Dec 8 10:04:59 UTC 2013 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/grantlee.git;a=commitdiff;h=eed6cca

The following commit has been merged in the master branch:
commit eed6cca5ed1dfa2627891fec3f7fbe2d09f14ae2
Author: Pino Toscano <pino at debian.org>
Date:   Sun Dec 8 11:04:37 2013 +0100

    copyright: convert to copyright-format v1.0, and update
---
 debian/changelog |   1 +
 debian/copyright | 250 +++++++++++++++++++++++++++++++++++++++----------------
 2 files changed, 178 insertions(+), 73 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a074fed..31103b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ grantlee (0.4.0-0r1) UNRELEASED; urgency=low
     - testinternationalization-qreal.diff: remove, applied upstream
   * Update .install files.
   * Bump Standards-Version to 3.9.5, no changes required.
+  * Convert copyright to copyright-format v1.0, and update it.
 
  -- Debian Krap Maintainers <debian-qt-kde at lists.debian.org>  Sun, 08 Dec 2013 09:56:01 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 530e7cd..8cc0da3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,80 +1,184 @@
-This package was debianized by the Debian Qt/KDE maintainers in 2010.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: grantlee
+Source: http://downloads.grantlee.org
 
-This package is fetched from http://downloads.grantlee.org
+Files: *
+Copyright: 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either version
+ 2.1 of the Licence, or (at your option) any later version.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ 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'.
 
-Licenses, upstream authors and copyright holders:
+Files: 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
+       templates/i18n/i18ntags.h
+       templates/i18n/l10n_money.cpp
+       templates/i18n/l10n_money.h
+Copyright: 2010, Stephen Kelly <steveire at gmail.com>
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either version
+ 2 of the Licence, or (at your option) any later version.
+ .
+ This library 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
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ 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
+ 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
+    notice, this list of conditions and the following disclaimer.
+ 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
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-        Copyright: 2008-2010, Stephen Kelly <steveire at gmail.com>
-        License: LGPL-2+
-         This library is free software; you can redistribute it and/or modify it
-         under the terms of the GNU Library General Public License as published by
-         the Free Software Foundation; either version 2 of the License, or (at your
-         option) any later version.
+Files: examples/books/bookdelegate.cpp
+       examples/books/bookdelegate.h
+       examples/books/bookwindow.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+
+ 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
+ contained in the either Technology Preview License Agreement or the
+ Beta Release License Agreement.
+ .
+ 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.
+ .
+ In addition, as a special exception, Nokia gives you certain
+ additional rights. These rights are described in the Nokia Qt LGPL
+ Exception version 1.0, 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 are unsure which license is appropriate for your use, please
+ contact the sales department at qt-sales 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'.
 
-         This library 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 Library General Public
-         License for more details.
+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:
+ .
+ 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.
 
-         You should have received a copy of the GNU Library General Public License
-         along with this library; see the file COPYING.LIB.  If not, write to the
-         Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-         02110-1301, USA.
+Files: scripts/extract_strings_gettext.py
+       scripts/extract_strings_linguist.py
+       scripts/strings_extractor_gettext.p
+       scripts/strings_extractor_linguist.py
+       scripts/strings_extractor.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 above copyright
+    notice, this list of conditions and the following disclaimer.
+ 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.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-On Debian systems, the complete text of the GNU Library General
-Public License can be found in `/usr/share/common-licenses/LGPL-2'.
-
-
-examples/books/bookdelegate.cpp
-examples/books/bookdelegate.h
-examples/books/bookwindow.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+
-         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
-         contained in the either Technology Preview License Agreement or the
-         Beta Release License Agreement.
-         .
-         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.
-         .
-         In addition, as a special exception, Nokia gives you certain
-         additional rights. These rights are described in the Nokia Qt LGPL
-         Exception version 1.0, 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 are unsure which license is appropriate for your use, please
-         contact the sales department at qt-sales at nokia.com.
-
-On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
-
-On Debian systems, the complete text of the GNU General 
-Public License can be found in `/usr/share/common-licenses/GPL-3'.
-
-The Debian packaging is Copyright (C) 2010, Debian Qt/KDE Maintainers
-<debian-qt-kde at lists.debian.org> and is licensed under the GPL-2,
-see `/usr/share/common-licenses/GPL-2'.
+Files: debian/*
+Copyright: 2010, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+License: GPL-2
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in `/usr/share/common-licenses/GPL-2'.

-- 
Grantlee template engine packaging

More information about the pkg-kde-commits mailing list