summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPino Toscano <pino@kde.org>2011-06-04 15:45:37 +0200
committerPino Toscano <pino@kde.org>2011-06-04 15:45:37 +0200
commitc6f034a54a66c854b57ddd68cc05e87db1dd391b (patch)
tree0dbdf4c1aa5f00fe0bb2595e8724c6832f5d20e4
parent8420955d8858b93bf5d49474bad1ab2e2f9e34e4 (diff)
downloadkde4libs-c6f034a54a66c854b57ddd68cc05e87db1dd391b.tar.gz
move kdeui.upd to kdelibs5-plugins
fix my previous fix with Modestas' advices
-rw-r--r--debian/changelog4
-rw-r--r--debian/control8
-rw-r--r--debian/kdelibs5-data.install1
-rw-r--r--debian/kdelibs5-plugins.install1
4 files changed, 7 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index d2c465a..ad5b230 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
kde4libs (4:4.6.3-3) UNRELEASED; urgency=low
[ Pino Toscano ]
- * kdelibs5-data: make it break/replace kdelibs5-plugins << 4:4.6.1.
- (Closes: #629188)
+ * Move kdeui.upd to kdelibs5-plugins, and make it break/replace
+ kdelibs5-data << 4:4.6.3-3~. (Closes: #629188)
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sat, 04 Jun 2011 13:28:40 +0200
diff --git a/debian/control b/debian/control
index b7dff3f..4f6a9fd 100644
--- a/debian/control
+++ b/debian/control
@@ -467,8 +467,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
kdelibs-bin (= ${binary:Version}),
dbus-x11, shared-mime-info (>= 0.30), xdg-utils
Recommends: ttf-dejavu, kdebase-runtime (>= 4:4.6)
-Replaces: kdelibs5-dev (<< 4:4.6.2)
-Breaks: kdelibs5-dev (<< 4:4.6.2), kdevelop (<< 4:4.2)
+Replaces: kdelibs5-dev (<< 4:4.6.2), kdelibs5-data (<< 4:4.6.3-3~)
+Breaks: kdelibs5-dev (<< 4:4.6.2), kdelibs5-data (<< 4:4.6.3-3~), kdevelop (<< 4:4.2)
Description: core plugins for KDE Applications
This package contains core plugins for KDE Applications used by KDE
Applications and KDE Development Platform libraries at runtime. This package
@@ -479,8 +479,8 @@ Description: core plugins for KDE Applications
Package: kdelibs5-data
Architecture: all
Depends: ${perl:Depends}, ${misc:Depends}, hicolor-icon-theme
-Replaces: libplasma2, kdebase-runtime-data (<< 4:4.5.85), kdelibs5-plugins (<< 4:4.6.1)
-Breaks: libplasma2, kdebase-runtime-data (<< 4:4.5.85), kdelibs5-plugins (<< 4:4.6.1)
+Replaces: libplasma2, kdebase-runtime-data (<< 4:4.5.85)
+Breaks: libplasma2, kdebase-runtime-data (<< 4:4.5.85)
Description: core shared data for all KDE Applications
This package contains architecture-independent data files needed to run KDE
Applications.
diff --git a/debian/kdelibs5-data.install b/debian/kdelibs5-data.install
index 9646268..3f7ad46 100644
--- a/debian/kdelibs5-data.install
+++ b/debian/kdelibs5-data.install
@@ -287,7 +287,6 @@ usr/share/kde4/apps/kcm_componentchooser/kcm_instantmessenger.desktop
usr/share/kde4/apps/kcm_componentchooser/kcm_ktexteditor.desktop
usr/share/kde4/apps/kconf_update/kcookiescfg.upd
usr/share/kde4/apps/kconf_update/kded.upd
-usr/share/kde4/apps/kconf_update/kdeui.upd
usr/share/kde4/apps/kconf_update/kioslave.upd
usr/share/kde4/apps/kconf_update/ksslcertificatemanager.upd
usr/share/kde4/apps/kconf_update/ksslcertificatemanager.upd.sh
diff --git a/debian/kdelibs5-plugins.install b/debian/kdelibs5-plugins.install
index 761f827..1dc394d 100644
--- a/debian/kdelibs5-plugins.install
+++ b/debian/kdelibs5-plugins.install
@@ -71,3 +71,4 @@ usr/lib/qt4/plugins/designer/kde3supportwidgets.so
usr/lib/qt4/plugins/designer/kdedeprecated.so
usr/lib/qt4/plugins/designer/kdewebkitwidgets.so
usr/lib/qt4/plugins/designer/kdewidgets.so
+usr/share/kde4/apps/kconf_update/kdeui.upd