[SCM] KDE Base Runtime module packaging branch, master, updated. debian/4.12.4-1
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Apr 30 10:18:18 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-runtime.git;a=commitdiff;h=5dc0821
The following commit has been merged in the master branch:
commit 5dc0821ade6c0a2f5586b43415363ae716c0d77d
Author: Maximiliano Curia <maxy at debian.org>
Date: Fri Feb 7 11:28:23 2014 +0100
Update build dependencies.
---
debian/changelog | 1 +
debian/control | 2 ++
debian/copyright | 78 ++++++++++++++++++++++++++++----------------------------
3 files changed, 42 insertions(+), 39 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 71efa84..69d0975 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
kde-runtime (4:4.12.2-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Update build dependencies.
-- Maximiliano Curia <maxy at debian.org> Tue, 04 Feb 2014 19:10:35 +0100
diff --git a/debian/control b/debian/control
index 7b69b8c..084a7b2 100644
--- a/debian/control
+++ b/debian/control
@@ -16,9 +16,11 @@ Build-Depends: cmake,
kdoctools (>= 4:4.11),
libasound2-dev (>= 1.0.14a) [linux-any],
libattica-dev (>= 0.1.4),
+ libboost-dev,
libbz2-dev,
libcanberra-dev,
libexiv2-dev (>= 0.12),
+ libgpgme11-dev,
libjpeg-dev,
libkactivities-dev (>= 4:4.11),
liblzma-dev,
diff --git a/debian/copyright b/debian/copyright
index a032e3d..c53030b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -85,7 +85,7 @@ Files under desktoptheme/
| CC-by v2.0 file removed from within the svg images
---
+--
Files under doc/
@@ -120,13 +120,13 @@ Copyright: © 2009 A. L. Spehr <spehr at kde.org>
| 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.
@@ -240,7 +240,7 @@ Copyright (C) 2007 Andreas Hartmetz <ahartmetz at gmail.com>
Copyright (C) 2001-2002 Ellis Whitebread <ellis at kde.org>
Copyright (C) 2006 Marijn Kruisselbrink <m.kruisselbrink at student.tue.nl>
-License for all components is:
+License for all components is:
* GNU Library General Public License (LGPL) v2 or later.
--
@@ -259,7 +259,7 @@ Copyright: © 1998 Pietro Iglio <iglio at fub.it>
License for all components is:
* BSD-ish
- for further information please read /kdesu/LICENSE.readme
+ for further information please read /kdesu/LICENSE.readme
--
@@ -270,7 +270,7 @@ Copyright: © 2003 Waldo Bastian <bastian at kde.org>
Copyright: © 2008 Urs Wolfer <uwolfer @ kde.org>
Copyright: © 2002 Daniel Molkentin <molkentin at kde.org>
-License for all components is:
+License for all components is:
* GNU Library General Public License (LGPL) v2 or later.
--
@@ -290,7 +290,7 @@ Copyright: © 2001,2002 Ellis Whitehead <ellis at kde.org>
Copyright: © 2006 Marijn Kruisselbrink <m.kruisselbrink at student.tue.nl>
-License for all components is:
+License for all components is:
* GNU Library General Public License (LGPL) v2 or later.
--
@@ -314,9 +314,9 @@ The following components are not licensed under :
* GNU General Public License, version 2:
-/htmlsearch/progressdialog.ccp
- -//htmlsearch/htmlsearch.ccp
+ -//htmlsearch/htmlsearch.ccp
-/htmlsearch/htmlsearch.h
- -testmetainfo.cpp
+ -testmetainfo.cpp
-docentry.cpp
-docentry.h
-docentrytraverser.cpp
@@ -506,8 +506,8 @@ Copyright: © 2009 by Laurent Montel <montel at kde.org>
License for all components:
* GNU General Public License version 2 or later
-
---
+
+--
Files under kpasswdserver/
@@ -595,7 +595,7 @@ Other used licenses:
* BSD-ish
- light/*
---
+--
Files under ktimezoned/
@@ -648,7 +648,7 @@ Copyright: © 2008 Micheal Leopold <lemma at confuego.or>
Copyright: © 2007 Pino Toscano <pino at kde.org>
* GNU library general public license, version 2 or later.
- - A few files( kwalletwizard.{h,cpp} kbetterthankdialog.{h,cpp})
+ - A few files( kwalletwizard.{h,cpp} kbetterthankdialog.{h,cpp})
is under GNU General Public License version2 or later
--
@@ -708,7 +708,7 @@ License for all components unless stated otherwise:
- strigibackend/tstring.cpp
- strigibackend/tstring.h
---
+--
Files under phonon/
@@ -753,57 +753,57 @@ Copyright: The Oxygen Icon Theme
| Copyright (C) 2007 Nuno Fernades Pinheiro <nf.pinheiro at gmail.com>
| Copyright (C) 2007 Riccardo Iaconelli <riccardo at oxygen-icons.org>
| Copyright (C) 2007 David Miller <miller at oxygen-icons.org>
- |
+ |
| and others.
- |
+ |
| You may copy it under the Creative Common Attribution-ShareAlike 3.0
| license, as found here:
- |
+ |
| http://creativecommons.org/licenses/by-sa/3.0/
- |
+ |
| or the GNU Library General Public License (with following clarification).
- |
+ |
| 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.
- |
+ |
| 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 Library 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
- |
+ |
| Clarification:
- |
+ |
| The GNU Lesser General Public License or LGPL is written for
| software libraries in the first place. We expressly want the LGPL to
| be valid for this artwork library too.
- |
+ |
| KDE Oxygen theme icons is a special kind of software library, it is an
| artwork library, it's elements can be used in a Graphical User Interface, or
| GUI.
- |
+ |
| Source code, for this library means:
| - where they exist, SVG;
| - otherwise, if applicable, the multi-layered formats xcf or psd, or
| otherwise png.
- |
+ |
| The LGPL in some sections obliges you to make the files carry
| notices. With images this is in some cases impossible or hardly useful.
- |
+ |
| With this library a notice is placed at a prominent place in the directory
| containing the elements. You may follow this practice.
- |
+ |
| The exception in section 6 of the GNU Lesser General Public License covers
| the use of elements of this art library in a GUI.
- |
+ |
--
-
+
Files under plasma/
Copyright: © 2008-2010 Aaron Seigo <aseigo at kde.org>
@@ -873,7 +873,7 @@ The following files are released under the:
- scriptengines/javascript/simplebindings/appletinterface.cpp
- tools/plasmapkg/main.cpp
---
+--
Files under platforms/
@@ -899,10 +899,10 @@ Other used licenses:
* GNU General Public License, version 2:
The files (1) below are licensed under this license:
-/win/kwinstartmenu/linkfile.h
-
+
* BSD-ish:
-/win/contextmenu/*
- for further information please read /platforms/win/contexmenu/license.txt
+ for further information please read /platforms/win/contexmenu/license.txt
--
Files under renamedlgplugins/
@@ -919,11 +919,11 @@ Other used licenses:
* BSBish:
The files (1) below are licensed under this license:
-/images/imageplugin.cpp
-
---
+
+--
Files under solid-hardware/
-
+
Copyright: © 2006 Kevin Ottens <ervin at kde.org>
License for all components is:
@@ -937,7 +937,7 @@ Copyright: © 2006 Kevin Ottens <ervin at kde.org>
License for all components unless stated otherwise:
* GNU Library General Public License, version 2
---
+--
Files under soliduiserver/
@@ -957,10 +957,10 @@ On Debian systems, you can find the complete texts of these licenses at:
- LGPLv2: /usr/share/common-licenses/LGPL-2
- LGPLv2.1: /usr/share/common-licenses/LGPL-2.1
- GFDL: /usr/share/common-licenses/GFDL
-
+
The Debian packaging is Copyright (C) 2007-2010, Debian Qt/KDE Maintainers
-<debian-qt-kde at lists.debian.org> and is licensed under the GPL-2,
+<debian-qt-kde at lists.debian.org> and is licensed under the GPL-2,
see `/usr/share/common-licenses/GPL-2'.
--
KDE Base Runtime module packaging
More information about the pkg-kde-commits
mailing list