[SCM] KDE Base Runtime module packaging branch, master, updated. debian/4.4.5-1-41-g174474b
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Mon Jan 17 04:10:06 UTC 2011
The following commit has been merged in the master branch:
commit a2546c7a4730e7050ac2e5feb2023aef20d1bb8b
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Sun Jan 16 21:23:31 2011 +0000
Bump S-V to 3.9.1: update Breaks/Replaces/Conflicts
---
debian/changelog | 6 ++++--
debian/control | 24 ++++++++++++++++--------
2 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4dce9d3..29d73e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,7 @@ kdebase-runtime (4:4.5.95-0r1) UNRELEASED; urgency=low
* Change my email address in uploaders.
* Refresh patches.
* Update installed files.
- * Add replaces:
+ * Add Breaks/Replaces:
- kdebase-runtime-data replaces kdelibs5-data << 4:4.5.0
due to moved kcmremotewidgets data files.
- kdebase-runtime replaces kdelibs5-plugins << 4:4.5.0 and
@@ -30,7 +30,9 @@ kdebase-runtime (4:4.5.95-0r1) UNRELEASED; urgency=low
* Cleanup unused lintian overrides.
[ José Manuel Santamaría Lema ]
- * Add replaces:
+ * Bump S-V to 3.9.1:
+ - update Breaks/Replaces/Conflicts to conform to new policy.
+ * Add Breaks/Replaces:
- kdebase-runtime-data replaces plasma-widget-networkmanagement <=
0.1~svn1175124-1 because they both install
/usr/share/kde4/apps/desktoptheme/default/icons/network.svgz
diff --git a/debian/control b/debian/control
index bddd695..c5dfd2a 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.4.5),
shared-desktop-ontologies,
libntrack-qt4-dev [linux-any], libpulse-dev, libcanberra-dev,
libnm-util-dev (>= 0.7) [linux-any], network-manager-dev (>= 0.7.0) [linux-any]
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Homepage: http://www.kde.org/
Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kdebase-runtime.git
Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kdebase-runtime.git
@@ -26,9 +26,12 @@ Section: kde
Architecture: any
Replaces: kdebase-bin (<< 4:4.2.90), kdelibs5 (<< 4:4.4.0), kdelibs-bin (<< 4:4.1.80),
kdebase-workspace-bin (<< 4:4.2.90), kdebase-bin-kde3, kdebase-runtime-bin-kde4, kcontrol,
- kdebase-runtime-data (<< 4:4.4.0), kdelibs5-plugins (<< 4:4.5.0)
-Conflicts: kdebluetooth (<< 1.0~beta7-1), phonon-backend-xine (<< 4:4.2.80), kdebase-runtime-bin-kde4,
- kdebase-bin-kde3, kcontrol, kdebase-kio-plugins
+ kdebase-runtime-data (<< 4:4.4.0), kdelibs5-plugins (<< 4:4.5.0), kdebluetooth (<< 1.0~beta7-1),
+ kdebase-kio-plugins
+Breaks: kdebase-bin (<< 4:4.2.90), kdelibs5 (<< 4:4.4.0), kdelibs-bin (<< 4:4.1.80),
+ kdebase-workspace-bin (<< 4:4.2.90), kdebase-bin-kde3, kdebase-runtime-bin-kde4, kcontrol,
+ kdebase-runtime-data (<< 4:4.4.0), kdelibs5-plugins (<< 4:4.5.0), kdebluetooth (<< 1.0~beta7-1),
+ kdebase-kio-plugins, phonon-backend-xine (<< 4:4.2.80)
Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
kdebase-runtime-data (>= ${source:Version}), ${sameVersionDep:kdelibs5-plugins:kdebase-runtime},
oxygen-icon-theme (>= 4:4.4), phonon-backend-xine | phonon-backend,
@@ -52,8 +55,10 @@ Depends: ${perl:Depends}, ${misc:Depends}
Replaces: kdebase-data (<< 4:4.2.90), kdebase-bin (<< 4:4.0.0), drkonqi, kdelibs5-data (<< 4:4.5.0),
kdebase-workspace-data (<< 4:4.1.85+svn897913), akonadi-kde (<< 4:4.2.90), kde-icons-oxygen (<= 4:4.2.4-1),
kdebase-data (<< 4:4.0.0), kdebase-runtime-data-common, plasma-widget-networkmanagement (<= 0.1~svn1175124-1)
-Conflicts: drkonqi, phonon-backend-xine (<< 4:4.2.80), kdebase-runtime-data-common,
- kdebase-bin (<< 4:4.0.0), kdebase-data (<< 4:4.0.0)
+Breaks: kdebase-data (<< 4:4.2.90), kdebase-bin (<< 4:4.0.0), drkonqi, kdelibs5-data (<< 4:4.5.0),
+ kdebase-workspace-data (<< 4:4.1.85+svn897913), akonadi-kde (<< 4:4.2.90), kde-icons-oxygen (<= 4:4.2.4-1),
+ kdebase-data (<< 4:4.0.0), kdebase-runtime-data-common, plasma-widget-networkmanagement (<= 0.1~svn1175124-1),
+ phonon-backend-xine (<< 4:4.2.80)
Description: shared data files for the KDE base runtime module
This package contains the architecture-independent shared data files needed to
run KDE applications.
@@ -65,8 +70,8 @@ Section: kde
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: htdig
-Replaces: kdebase-runtime-data (<< 4:4.0.80-2), kdebase-runtime (<< 4:4.0.80-2)
-Conflicts: khelpcenter
+Replaces: kdebase-runtime-data (<< 4:4.0.80-2), kdebase-runtime (<< 4:4.0.80-2), khelpcenter
+Breaks: kdebase-runtime-data (<< 4:4.0.80-2), kdebase-runtime (<< 4:4.0.80-2), khelpcenter
Description: help center
The KDE Help Center displays documentation on how to use the KDE plasma
workspaces and applications, as well as UNIX man and info pages.
@@ -79,6 +84,7 @@ Section: kde
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xine-x:Depends}
Replaces: kdebase-runtime-data (<< 4:4.4.0), kdebase-runtime (<< 4:4.4.0)
+Breaks: kdebase-runtime-data (<< 4:4.4.0), kdebase-runtime (<< 4:4.4.0)
Description: advanced Phonon Xine configuration
This package contains a configuration module for tweaking some of the more
advanced settings for Phonon's Xine backend.
@@ -90,6 +96,7 @@ Section: kde
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: kdebase-workspace-bin (<< 4:4.1.82+svn893000), kdebase-workspace-data (<< 4:4.1.82)
+Breaks: kdebase-workspace-bin (<< 4:4.1.82+svn893000), kdebase-workspace-data (<< 4:4.1.82)
Description: the 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
@@ -103,6 +110,7 @@ Architecture: any
Priority: extra
Depends: kdebase-runtime (= ${binary:Version}), kdelibs5-dbg
Replaces: kdelibs5-dbg (<< 4:4.5.0), kdebase-dbg (<< 4:4.2.90), kdebase-workspace-dbg (<< 4:4.2.90)
+Breaks: kdelibs5-dbg (<< 4:4.5.0), kdebase-dbg (<< 4:4.2.90), kdebase-workspace-dbg (<< 4:4.2.90)
Description: debugging symbols for KDE base runtime module
This package contains the debugging symbols associated with kdebase-runtime.
They will automatically be used by gdb for debugging kdebase-runtime related
--
KDE Base Runtime module packaging
More information about the pkg-kde-commits
mailing list