[SCM] khangman packaging branch, master, updated. debian/4.14.1-1-21-g6665a06
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Feb 24 16:25:27 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/khangman.git;a=commitdiff;h=c18da58
The following commit has been merged in the master branch:
commit c18da583b9f4a657d94f7a87faf497de7a21f3bb
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Sun Feb 22 12:31:52 2015 +0100
Update copyright information.
---
debian/changelog | 1 +
debian/copyright | 101 +++++++++++++++++++++++++++++++++++++++++++------------
2 files changed, 80 insertions(+), 22 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0c80155..3ba9502 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ khangman (4:14.12.2-1~) UNRELEASED; urgency=medium
[ Maximiliano Curia ]
* New upstream release (14.12.2).
+ * Update copyright information.
-- Maximiliano Curia <maxy at debian.org> Sun, 22 Feb 2015 11:39:27 +0100
diff --git a/debian/copyright b/debian/copyright
index 1c605da..e4c9d5e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,25 +4,17 @@ Upstream-Contact: kde-edu at mail.kde.org
Source: download.kde.org
Files: *
-Copyright: 2001-2009, Anne-Marie Mahfouf <annma at kde.org>
-License: GPL-2+
-
-Files: src/khmtheme.cpp
- src/khmtheme.h
- src/langutils.cpp
- src/langutils.h
-Copyright: 2007-2010 Pino Toscano <pino at kde.org>
-License: GPL-2+
-
-Files: src/khmthemefactory.cpp
- src/khmthemefactory.h
-Copyright: 2010 Adam Rakowski <foo-script at o2.pl>
-License: GPL-2+
-
-Files: src/timer.cpp
- src/timer.h
-Copyright: 2005, Michael Goettsche <michael.goettsche at kdemail.net>
- 2006, Anne-Marie Mahfouf <annma at kde.org>
+Copyright: 2010, Adam Rakowski <foo-script at o2.pl> (GSoC 2010)
+ 2006, Anne-Marie Mahfouf
+ 2001-2010, Anne-Marie Mahfouf <annma at kde.org>
+ 2003, Dustin Norlander
+ 1989-1991, Free Software Foundation, Inc
+ 2012, Laszlo Papp <lpapp at kde.org>
+ 2011, Marco Martin <mart at kde.org>
+ 2005, Mark Kretschmann <markey at web.de>
+ 2005, Michael Goettsche
+ 2007-2010, Pino Toscano <pino at kde.org>
+ 2011, Sebastian Kügler <sebas at kde.org>
License: GPL-2+
Files: doc/*
@@ -33,9 +25,74 @@ License: GFDL-1.2+
or any later version published by the Free Software Foundation;
with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
.
- On Debian systems, the full text of the GNU Free Documentation
- License version 1.2 can be found in the file
- `/usr/share/common-licenses/GFDL-1.2'.
+ On Debian systems, the full text of the GNU Free Documentation License
+ version 1.2 can be found in the file `/usr/share/common-licenses/GFDL-1.2'.
+
+Files: src/harmattan/GamePage.qml
+ src/harmattan/LetterElement.qml
+ src/harmattan/ListItem.qml
+ src/harmattan/MainPage.qml
+ src/harmattan/MainSettingsPage.qml
+ src/harmattan/khangmanenginehelper.cpp
+ src/harmattan/khangmanenginehelper.h
+ src/harmattan/main.cpp
+ src/harmattan/main.qml
+ src/plasma-active/src/main.cpp
+ src/plasma-active/src/mainwindow.cpp
+ src/plasma-active/src/mainwindow.h
+Copyright: 2011-2012, Laszlo Papp <lpapp at kde.org>
+ 2011, Marco Martin <mart at kde.org>
+ 2011, Sebastian Kügler <sebas at kde.org>
+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 License, 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, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU Lesser General Public License
+ version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
+
+Files: src/engine/cmake/FindKHangManEngine.cmake
+ src/harmattan/CommonDialog.qml
+ src/harmattan/MySelectionDialog.qml
+ src/harmattan/UIConstants.js
+Copyright: 2012, Laszlo Papp
+ 2011, Nokia Corporation and/or its subsidiary(-ies)
+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:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * 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.
+ * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+ the names of its contributors may be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "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 COPYRIGHT
+ OWNER OR CONTRIBUTORS 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.
Files: debian/*
Copyright: 2011, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
--
khangman packaging
More information about the pkg-kde-commits
mailing list