[SCM] KDE PIM Runtime module packaging branch, master, updated. debian/4.11.3-1-6-gbcf9bab
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Jan 29 16:56:53 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim-runtime.git;a=commitdiff;h=e477c8f
The following commit has been merged in the master branch:
commit e477c8fa938cc6a5ad492b278879364b9c30f49b
Author: Maximiliano Curia <maxy at debian.org>
Date: Wed Jan 29 16:48:32 2014 +0100
wrap-and-sort
---
debian/control | 48 +++++++++++++++++++++++++++----------------
debian/copyright | 12 +++++------
debian/kdepim-runtime.install | 2 +-
3 files changed, 36 insertions(+), 26 deletions(-)
diff --git a/debian/control b/debian/control
index 04bed72..e06f253 100644
--- a/debian/control
+++ b/debian/control
@@ -7,18 +7,29 @@ Uploaders: Sune Vuorela <debian at pusling.com>,
Modestas Vainius <modax at debian.org>,
George Kiagiadakis <kiagiadakis.george at gmail.com>,
Maximiliano Curia <maxy at debian.org>
-Build-Depends: kde-sc-dev-latest (>= 4:4.11),
- debhelper (>= 9), cmake, pkg-kde-tools (>= 0.12),
- kdepimlibs5-dev (>= 4:4.11.3), kdelibs5-dev (>= 4:4.11),
- libakonadi-dev (>= 1.9.80),
- libxml2-dev, xsltproc, libstrigiqtdbusclient-dev, libboost-dev (>= 1.40.0-2),
- libstreamanalyzer-dev, shared-mime-info (>= 0.30),
- shared-desktop-ontologies (>= 0.11),
- nepomuk-core-dev (>= 4:4.11), libqjson-dev, libsoprano-dev (>= 2.9),
- libkolabxml-dev, libkolab-dev (>= 0.4.2-7~),
- libkgapi-dev (>= 1.9.81), libqtwebkit-dev,
- libx11-dev,
- pkg-config
+Build-Depends: cmake,
+ debhelper (>= 9),
+ kde-sc-dev-latest (>= 4:4.11),
+ kdelibs5-dev (>= 4:4.11),
+ kdepimlibs5-dev (>= 4:4.11.3),
+ libakonadi-dev (>= 1.9.80),
+ libboost-dev (>= 1.40.0-2),
+ libkgapi-dev (>= 1.9.81),
+ libkolab-dev (>= 0.4.2-7~),
+ libkolabxml-dev,
+ libqjson-dev,
+ libqtwebkit-dev,
+ libsoprano-dev (>= 2.9),
+ libstreamanalyzer-dev,
+ libstrigiqtdbusclient-dev,
+ libx11-dev,
+ libxml2-dev,
+ nepomuk-core-dev (>= 4:4.11),
+ pkg-config,
+ pkg-kde-tools (>= 0.12),
+ shared-desktop-ontologies (>= 0.11),
+ shared-mime-info (>= 0.30),
+ xsltproc
Standards-Version: 3.9.5
XS-Testsuite: autopkgtest
Homepage: http://pim.kde.org/
@@ -27,12 +38,13 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kdepim-runtime.git
Package: kdepim-runtime
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libkolab0(>= 0.4.2-7~),
- kdepimlibs-kio-plugins,
- akonadi-server (>= 1.8)
+Depends: akonadi-server (>= 1.8),
+ kdepimlibs-kio-plugins,
+ libkolab0(>= 0.4.2-7~),
+ ${misc:Depends},
+ ${shlibs:Depends}
Replaces: akonadi-kde, libmaildir4
-Breaks: akonadi-kde, libmaildir4, kdepimlibs5 (<< 4:4.4)
+Breaks: akonadi-kde, kdepimlibs5 (<< 4:4.4), libmaildir4
Description: runtime components for Akonadi KDE
This package contains Akonadi agents written using KDE Development Platform
libraries.
@@ -47,7 +59,7 @@ Priority: extra
Architecture: any
Replaces: kdepim-dbg (<< 4:4.4)
Breaks: kdepim-dbg (<< 4:4.4)
-Depends: ${misc:Depends}, kdepim-runtime (= ${binary:Version})
+Depends: kdepim-runtime (= ${binary:Version}), ${misc:Depends}
Description: debugging files for Akonadi KDE runtime components
This package contains debugging symbols associated with kdepim-runtime.
They will automatically be used by gdb for debugging issues related to
diff --git a/debian/copyright b/debian/copyright
index d5ae9a8..1750ee6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,7 +11,7 @@ Upstream Authors:
Till Adams
Thomas McGuire
Stephen Kelly
- and others
+ and others
Copyright:
@@ -82,14 +82,14 @@ License:
02110-1301, USA.
For full text of the GNU Library General Public License, see
- /usr/share/common-licenses/LGPL-2
+ /usr/share/common-licenses/LGPL-2
lgplv2.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
@@ -101,7 +101,7 @@ License:
02110-1301 | USA
For full text of the GNU Lesser General Public License, see
- /usr/share/common-licenses/LGPL-2.1
+ /usr/share/common-licenses/LGPL-2.1
gplv2:
This program is free software; you can redistribute it and/or
@@ -119,7 +119,7 @@ License:
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
For full text of the GNU General Public License, see
- /usr/share/common-licenses/GPL-2
+ /usr/share/common-licenses/GPL-2
gplv3
This program is free software: you can redistribute it and/or modify
@@ -164,5 +164,3 @@ The Debian packaging is:
Copyright (C) 2009 Sune Vuorela <debian at pusling.com>
and available under the gnu library public license, version 2, or at your opinion any later version.
-
-
diff --git a/debian/kdepim-runtime.install b/debian/kdepim-runtime.install
index 4e14e69..82d54b2 100644
--- a/debian/kdepim-runtime.install
+++ b/debian/kdepim-runtime.install
@@ -191,8 +191,8 @@ usr/share/kde4/services/akonadi/davgroupware-providers/citadel.desktop
usr/share/kde4/services/akonadi/davgroupware-providers/davical.desktop
usr/share/kde4/services/akonadi/davgroupware-providers/egroupware.desktop
usr/share/kde4/services/akonadi/davgroupware-providers/opengroupware.desktop
-usr/share/kde4/services/akonadi/davgroupware-providers/owncloud.desktop
usr/share/kde4/services/akonadi/davgroupware-providers/owncloud-pre5.desktop
+usr/share/kde4/services/akonadi/davgroupware-providers/owncloud.desktop
usr/share/kde4/services/akonadi/davgroupware-providers/scalix.desktop
usr/share/kde4/services/akonadi/davgroupware-providers/sogo.desktop
usr/share/kde4/services/akonadi/davgroupware-providers/yahoo.desktop
--
KDE PIM Runtime module packaging
More information about the pkg-kde-commits
mailing list