[SCM] libmm-qt packaging branch, master, updated. 60f3c408958d11271ff67ccce860a03b8071bdbd

Maximiliano Curia maxy at moszumanska.debian.org
Sat Mar 21 17:23:18 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/libmm-qt.git;a=commitdiff;h=b84519c

The following commit has been merged in the master branch:
commit b84519ca69c1ac90e1adc8a7806d98c3abac2f26
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Feb 10 19:24:00 2015 +0100

    Update copyright information.
---
 debian/changelog |  1 +
 debian/copyright | 94 +++++++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 66 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1a44726..10259cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libmm-qt (4:5.2.0-1~) UNRELEASED; urgency=medium
   * Prepare initial Debian release.
   * Update build dependencies to build against experimental and to
     follow cmake.
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 10 Feb 2015 19:04:33 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 1d91a8a..e65e352 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,37 +3,45 @@ Upstream-Name: libmm-qt
 Source: git://anongit.kde.org/libmm-qt
 
 Files: *
-Copyright: 2013-2014 Lukas Tinkl <ltinkl at redhat.com> <jgrulich at redhat.com>
-           2013 Grulich <jgrulich at redhat.com>
-           2010-2013 Lamarque Souza <lamarque at kde.org>
-           2008, 2011 Will Stephenson <wstephenson at kde.org>
-           2013 Anant Kamath <kamathanant at gmail.com>
-           2013 Daniel Nicoletti <dantti12 at gmail.com>
-           2013 Lamarque V. Souza <lamarque at kde.org>
-           2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
-License: LGPL-KDEeV
- 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) version 3, or any
- later version accepted by the membership of KDE e.V. (or its
- successor approved by the membership of KDE e.V.), which shall
- act as a proxy defined in Section 6 of version 3 of the license.
- .
- 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.
+Copyright: 2013, Anant Kamath <kamathanant at gmail.com>
+           2013, Daniel Nicoletti <dantti12 at gmail.com>
+           2013, Digia Plc and/or its subsidiary(-ies)
+           2013-2014, Lukas Tinkl <jgrulich at redhat.com>
+           2010-2013, Lamarque Souza <lamarque at kde.org>
+           2013-2014, Lukas Tinkl <ltinkl at redhat.com>
+           2008-2011, Will Stephenson <wstephenson at kde.org>
+License: LGPL-2.1+3+KDEeV
+
+Files: cmake/FindModemManager.cmake
+Copyright: 2006, Alexander Neundorf <neundorf at kde.org>
+           2007, Will Stephenson <wstephenson at kde.org>
+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:
  .
- 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/>.
+ 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.
  .
- 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".
+ 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.
 
 Files: examples/main.cpp
-Copyright: 2013 Jan Grulich <jgrulich at redhat.com>
-License: GPL-KDEeV
+Copyright: 2013, Jan Grulich <jgrulich at redhat.com>
+License: GPL-2+3+KDEeV
  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 the Free Software Foundation; either version 2 of
@@ -50,5 +58,33 @@ License: GPL-KDEeV
  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 text of the GNU General Public License
+ version 2 can be found in "/usr/share/common-licenses/GPL-2", likewise, the
+ complete text of the GNU General Public License version 3 can be found in
+ "/usr/share/common-licenses/GPL-3".
+
+Files: debian/*
+Copyright: 2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>
+License: LGPL-2.1+3+KDEeV
+
+License: LGPL-2.1+3+KDEeV
+ 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) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
+ .
+ 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", likewise,
+ the complete text of the GNU Lesser General Public License version 3 can be
+ found in "/usr/share/common-licenses/LGPL-3".

-- 
libmm-qt packaging



More information about the pkg-kde-commits mailing list