[SCM] libqinfinity packaging branch, master, updated. 70b4b7fa2a60d71284e62fff0e7ca7623f8838be

Diane Trout diane-guest at alioth.debian.org
Sat Oct 26 21:34:19 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libqinfinity.git;a=commitdiff;h=16c0fdf

The following commit has been merged in the master branch:
commit 16c0fdf6e5911a9a489ecae88de421cc151d1470
Author: Diane Trout <diane at ghic.org>
Date:   Sat Oct 26 14:32:09 2013 -0700

    Update copyright file, credit cmake writers, move previous packager to just copyrighting debian/*
---
 debian/changelog |    2 ++
 debian/copyright |   51 +++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 211b653..849f458 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ libqinfinity (1:0.5.1-1) experimental; urgency=low
   * Backport unversioned-header-dir.patch to put headers into an
     unversioned directory
   * Change Priority to optional for default, extra for the dbg file.
+  * Update copyright file, credit cmake writers, move previous packager
+    to just copyrighting debian/*
 
  -- Diane Trout <diane at ghic.org>  Sat, 19 Oct 2013 14:58:35 -0700
 
diff --git a/debian/copyright b/debian/copyright
index 2371b07..1b67438 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,11 +4,28 @@ Source: https://projects.kde.org/libqinfinity
 
 Files: *
 Copyright: 2009 Gregory Haynes <greg at greghaynes.net>
-           2011 Philpp Kern <phil at philkern.de>
-           2010 Ryan Kavanagh <ryanakca at kubuntu.org>
+           2011 Philipp Kern <phil at philkern.de>
            2013 Sven Brauch <svenbrauch at gmail.com>
 License: GPL-2.0+
 
+Files: CMakeModules/FindQt4.cmake
+Copyright: 2002 Kitware, Inc. Insight Consortium.
+License: BSD-3-clause
+
+Files: CMakeModules/FindLibXml2.cmake CMakeModules/FindGNUTLS.cmake
+ CMakeModules/FindGSASL.cmake CMakeModules/FindLibinftext.cmake
+ CMakeModules/FindGlib.cmake
+Copyright: 2008 Gregory Haynes <greg at greghaynes.net>
+License: BSD-3-clause
+
+Files: CMakeModules/FindGlib2.cmake
+Copyright: 2008 Laurent Montel, <montel at kde.org>
+License: BSD-3-clause
+
+Files: CMakeModules/FindGObject.cmake
+Copyright: 2006, Tim Beaulen <tbscope at gmail.com>
+License: BSD-3-clause
+
 Files: debian/*
 Copyright: 2009 Ryan Kavanagh <ryanakca at kubuntu.org>
            2013 Diane Trout <diane at ghic.org>
@@ -30,3 +47,33 @@ License: GPL-2.0+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+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 names of Kitware, Inc., the Insight Software Consortium,
+   nor the names of their 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
+ HOLDER 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.
+

-- 
libqinfinity packaging



More information about the pkg-kde-commits mailing list