[SCM] KDE Base Runtime module packaging branch, master, updated. debian/4.11.3-1-8-g48d1fb6
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Wed Jan 15 00:38:03 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-runtime.git;a=commitdiff;h=48d1fb6
The following commit has been merged in the master branch:
commit 48d1fb6040f4c4f1eadeaae63aadf13652b69dbb
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Tue Jan 14 21:37:38 2014 -0300
No-op wrap-and-sort.
---
debian/control | 151 +++++++++++++++++++++++++---------------
debian/kde-runtime-data.install | 4 +-
2 files changed, 98 insertions(+), 57 deletions(-)
diff --git a/debian/control b/debian/control
index 1d8600d..ec9240d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,29 +3,48 @@ Section: kde
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Sune Vuorela <sune at debian.org>,
- Fathi Boudra <fabo at debian.org>,
- Modestas Vainius <modax at debian.org>,
- George Kiagiadakis <kiagiadakis.george at gmail.com>,
- Eshat Cakar <info at eshat.de>,
- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
- Maximiliano Curia <maxy at debian.org>
-Build-Depends: kde-sc-dev-latest (>= 4:4.11),
- cmake, debhelper (>= 9), pkg-kde-tools (>= 0.12),
- kdepimlibs5-dev (>= 4:4.11), libkactivities-dev (>= 4:4.11),
- nepomuk-core-dev (>= 4:4.11), nepomuk-core-runtime (>= 4:4.11),
- kdoctools (>= 4:4.11),
- libphonon-dev (>= 4:4.6.0really4.4.3),
- pkg-config,
- libsmbclient-dev, libsoprano-dev (>= 2.6.50),
- libstreamanalyzer-dev (>= 0.6.3), libstrigiqtdbusclient-dev (>= 0.6.3),
- libopenexr-dev, libbz2-dev, libx11-dev, libxcursor-dev,
- libasound2-dev (>= 1.0.14a) [linux-any],
- libjpeg-dev, libslp-dev,
- liblzma-dev, libattica-dev (>= 0.1.4), libssh-dev (>= 0.4.0), libexiv2-dev (>= 0.12),
- libqca2-dev (>= 2.0.0), shared-desktop-ontologies (>= 0.7),
- libntrack-qt4-dev [linux-any], libpulse-dev (>= 0.9.16), libcanberra-dev,
- libnm-util-dev (>= 0.7) [linux-any], network-manager-dev (>= 0.7.0) [linux-any],
- libqtwebkit-dev, libqzeitgeist-dev, shared-mime-info
+ Fathi Boudra <fabo at debian.org>,
+ Modestas Vainius <modax at debian.org>,
+ George Kiagiadakis <kiagiadakis.george at gmail.com>,
+ Eshat Cakar <info at eshat.de>,
+ Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
+ Maximiliano Curia <maxy at debian.org>
+Build-Depends: cmake,
+ debhelper (>= 9),
+ kde-sc-dev-latest (>= 4:4.11),
+ kdepimlibs5-dev (>= 4:4.11),
+ kdoctools (>= 4:4.11),
+ libasound2-dev (>= 1.0.14a) [linux-any],
+ libattica-dev (>= 0.1.4),
+ libbz2-dev,
+ libcanberra-dev,
+ libexiv2-dev (>= 0.12),
+ libjpeg-dev,
+ libkactivities-dev (>= 4:4.11),
+ liblzma-dev,
+ libnm-util-dev (>= 0.7) [linux-any],
+ libntrack-qt4-dev [linux-any],
+ libopenexr-dev,
+ libphonon-dev (>= 4:4.6.0really4.4.3),
+ libpulse-dev (>= 0.9.16),
+ libqca2-dev (>= 2.0.0),
+ libqtwebkit-dev,
+ libqzeitgeist-dev,
+ libslp-dev,
+ libsmbclient-dev,
+ libsoprano-dev (>= 2.6.50),
+ libssh-dev (>= 0.4.0),
+ libstreamanalyzer-dev (>= 0.6.3),
+ libstrigiqtdbusclient-dev (>= 0.6.3),
+ libx11-dev,
+ libxcursor-dev,
+ nepomuk-core-dev (>= 4:4.11),
+ nepomuk-core-runtime (>= 4:4.11),
+ network-manager-dev (>= 0.7.0) [linux-any],
+ pkg-config,
+ pkg-kde-tools (>= 0.12),
+ shared-desktop-ontologies (>= 0.7),
+ shared-mime-info
Standards-Version: 3.9.5
Homepage: http://www.kde.org/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kde-runtime.git
@@ -33,21 +52,29 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kde-runtime.git
Package: kde-runtime
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
- kde-runtime-data (>= ${source:Version}), kdelibs5-plugins (>= ${source:Upstream-Version}),
- ${sameVersionDep:nepomuk-core-runtime:kde-runtime},
- oxygen-icon-theme (>= 4:4.6),
- shared-desktop-ontologies (>= 0.8), plasma-scriptengine-javascript (= ${binary:Version})
+Depends: kde-runtime-data (>= ${source:Version}),
+ kdelibs5-plugins (>= ${source:Upstream-Version}),
+ oxygen-icon-theme (>= 4:4.6),
+ plasma-scriptengine-javascript (= ${binary:Version}),
+ shared-desktop-ontologies (>= 0.8),
+ ${misc:Depends},
+ ${perl:Depends},
+ ${sameVersionDep:nepomuk-core-runtime:kde-runtime},
+ ${shlibs:Depends}
Recommends: virtuoso-minimal
-Suggests: djvulibre-bin, icoutils, finger
-Replaces: kdebase-runtime-bin-kde4,
- kdelibs5-plugins (<< 4:4.5), kdebase-workspace-bin (<< 4:4.6),
- kdebluetooth (<< 1.0~beta7-1), plasma-netbook (<< 4:4.5.95),
- kdebase-runtime (<< 4:4.7.2)
-Breaks: kdebase-runtime-bin-kde4,
- kdelibs5-plugins (<< 4:4.5), kdebase-workspace-bin (<< 4:4.6),
- kdebluetooth (<< 1.0~beta7-1), plasma-netbook (<< 4:4.5.95),
- kdebase-runtime (<< 4:4.7.2)
+Suggests: djvulibre-bin, finger, icoutils
+Replaces: kdebase-runtime (<< 4:4.7.2),
+ kdebase-runtime-bin-kde4,
+ kdebase-workspace-bin (<< 4:4.6),
+ kdebluetooth (<< 1.0~beta7-1),
+ kdelibs5-plugins (<< 4:4.5),
+ plasma-netbook (<< 4:4.5.95)
+Breaks: kdebase-runtime (<< 4:4.7.2),
+ kdebase-runtime-bin-kde4,
+ kdebase-workspace-bin (<< 4:4.6),
+ kdebluetooth (<< 1.0~beta7-1),
+ kdelibs5-plugins (<< 4:4.5),
+ plasma-netbook (<< 4:4.5.95)
Conflicts: kdelibs4-dev
Description: runtime components from the official KDE release
KDE is produced by an international technology team that creates free and open
@@ -63,7 +90,7 @@ Package: kdebase-runtime
Section: oldlibs
Priority: extra
Architecture: all
-Depends: ${misc:Depends}, kde-runtime
+Depends: kde-runtime, ${misc:Depends}
Description: Transitional package for the KDE runtime components
KDE is produced by an international technology team that creates free and open
source software for desktop and portable computing. Among KDE's products are a
@@ -77,15 +104,27 @@ Description: Transitional package for the KDE runtime components
Package: kde-runtime-data
Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}
-Replaces: kdebase-bin-kde3, kcontrol, kdebase-kio-plugins, kdebase-runtime-data-common,
- kdelibs5-data (<< 4:4.5), kdebase-workspace-bin (<< 4:4.5.95), plasma-netbook (<< 4:4.5.95),
- plasma-widget-networkmanagement (<< 0.1+git20110422.810bc16-1+),
- kdebase-runtime-data (<< 4:4.7.2), kde-workspace-bin (<< 4:4.10)
-Breaks: kdebase-bin-kde3, kcontrol, kdebase-kio-plugins, kdebase-runtime-data-common,
- kdelibs5-data (<< 4:4.5), kdebase-workspace-bin (<< 4:4.5.95), plasma-netbook (<< 4:4.5.95),
- plasma-widget-networkmanagement (<< 0.1+git20110422.810bc16-1+),
- kdebase-runtime-data (<< 4:4.7.2), kde-workspace-bin (<< 4:4.10)
+Depends: ${misc:Depends}, ${perl:Depends}
+Replaces: kcontrol,
+ kde-workspace-bin (<< 4:4.10),
+ kdebase-bin-kde3,
+ kdebase-kio-plugins,
+ kdebase-runtime-data (<< 4:4.7.2),
+ kdebase-runtime-data-common,
+ kdebase-workspace-bin (<< 4:4.5.95),
+ kdelibs5-data (<< 4:4.5),
+ plasma-netbook (<< 4:4.5.95),
+ plasma-widget-networkmanagement (<< 0.1+git20110422.810bc16-1+)
+Breaks: kcontrol,
+ kde-workspace-bin (<< 4:4.10),
+ kdebase-bin-kde3,
+ kdebase-kio-plugins,
+ kdebase-runtime-data (<< 4:4.7.2),
+ kdebase-runtime-data-common,
+ kdebase-workspace-bin (<< 4:4.5.95),
+ kdelibs5-data (<< 4:4.5),
+ plasma-netbook (<< 4:4.5.95),
+ plasma-widget-networkmanagement (<< 0.1+git20110422.810bc16-1+)
Description: shared data files for the KDE base runtime module
This package contains the architecture-independent shared data files needed to
run KDE applications.
@@ -94,7 +133,7 @@ Description: shared data files for the KDE base runtime module
Package: khelpcenter4
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: htdig
Replaces: khelpcenter
Breaks: khelpcenter
@@ -107,7 +146,7 @@ Description: help center
Package: plasma-scriptengine-javascript
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: JavaScript script engine for Plasma
This package provides the JavaScript script engine for Plasma. You have to
install it if you want to use Plasma widgets and data engines written in
@@ -119,11 +158,13 @@ Package: kde-runtime-dbg
Section: debug
Architecture: any
Priority: extra
-Depends: ${misc:Depends}, kde-runtime (= ${binary:Version}), kdelibs5-dbg
-Replaces: kdelibs5-dbg (<< 4:4.5), kdebase-workspace-dbg (<< 4:4.6),
- kdebase-runtime-dbg (<< 4:4.7.2)
-Breaks: kdelibs5-dbg (<< 4:4.5), kdebase-workspace-dbg (<< 4:4.6),
- kdebase-runtime-dbg (<< 4:4.7.2)
+Depends: kde-runtime (= ${binary:Version}), kdelibs5-dbg, ${misc:Depends}
+Replaces: kdebase-runtime-dbg (<< 4:4.7.2),
+ kdebase-workspace-dbg (<< 4:4.6),
+ kdelibs5-dbg (<< 4:4.5)
+Breaks: kdebase-runtime-dbg (<< 4:4.7.2),
+ kdebase-workspace-dbg (<< 4:4.6),
+ kdelibs5-dbg (<< 4:4.5)
Conflicts: kdelibs-dbg
Description: debugging symbols for KDE base runtime module
This package contains the debugging symbols associated with kde-runtime.
@@ -134,7 +175,7 @@ Package: kdebase-runtime-dbg
Section: oldlibs
Architecture: all
Priority: extra
-Depends: ${misc:Depends}, kde-runtime-dbg
+Depends: kde-runtime-dbg, ${misc:Depends}
Description: transitional package for kde-runtime-dbg
This is a dummy transitional package for kde-runtime-dbg and can be safely
removed after the installation is complete.
diff --git a/debian/kde-runtime-data.install b/debian/kde-runtime-data.install
index 7c46b5d..ba1daf4 100644
--- a/debian/kde-runtime-data.install
+++ b/debian/kde-runtime-data.install
@@ -412,8 +412,8 @@ usr/share/kde4/services/cgi.protocol
usr/share/kde4/services/comicbookthumbnail.desktop
usr/share/kde4/services/componentchooser.desktop
usr/share/kde4/services/cursorthumbnail.desktop
-usr/share/kde4/services/desktop.protocol
usr/share/kde4/services/desktop-search.desktop
+usr/share/kde4/services/desktop.protocol
usr/share/kde4/services/desktopthumbnail.desktop
usr/share/kde4/services/device_automounter_kcm.desktop
usr/share/kde4/services/directorythumbnail.desktop
@@ -569,8 +569,8 @@ usr/share/kde4/services/searchproviders/opendesktop.desktop
usr/share/kde4/services/searchproviders/pgpkeys.desktop
usr/share/kde4/services/searchproviders/php.desktop
usr/share/kde4/services/searchproviders/python.desktop
-usr/share/kde4/services/searchproviders/qt4.desktop
usr/share/kde4/services/searchproviders/qt.desktop
+usr/share/kde4/services/searchproviders/qt4.desktop
usr/share/kde4/services/searchproviders/rae.desktop
usr/share/kde4/services/searchproviders/rfc.desktop
usr/share/kde4/services/searchproviders/rpmfind.desktop
--
KDE Base Runtime module packaging
More information about the pkg-kde-commits
mailing list