From 33ec3dcbba58098f766a5d75455222cc7aa6ca86 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 23 Feb 2020 22:42:45 +0900 Subject: DEB: invert dependency between kcontrol and kicker. This resolves bug 1385. Signed-off-by: Michele Calgaro (cherry picked from commit d9a39a491e349ee0f52b8e8d7985539d9e0267ba) --- ubuntu/_base/tdebase/debian/control | 4 ++-- ubuntu/_base/tdebase/debian/kcontrol-trinity.install | 9 --------- ubuntu/_base/tdebase/debian/kicker-trinity.install | 9 +++++++++ 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'ubuntu/_base/tdebase') diff --git a/ubuntu/_base/tdebase/debian/control b/ubuntu/_base/tdebase/debian/control index 399ac3c11..fde096d21 100644 --- a/ubuntu/_base/tdebase/debian/control +++ b/ubuntu/_base/tdebase/debian/control @@ -323,9 +323,9 @@ Section: tde Architecture: any Replaces: kicker-kde3 (<< 4:14.0.0~), kicker-trinity (<< 4:14.0.0~) Breaks: kicker-kde3 (<< 4:14.0.0~), kicker-trinity (<< 4:14.0.0~) -Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${TDE-Version3}~), tdebase-data-trinity (<< ${TDE-Next-Version3}~) +Depends: ${shlibs:Depends}, kcontrol-trinity (>= ${source:Version}), tdebase-data-trinity (>> ${TDE-Version3}~), tdebase-data-trinity (<< ${TDE-Next-Version3}~) Suggests: khelpcenter-trinity, kicker-applets-trinity, menu -Conflicts: tdebase-libs-trinity (<< 4:3.0.0) +Conflicts: tdebase-libs-trinity (<< 4:3.0.0), kcontrol-trinity (<< 4:14.0.8~) Description: desktop panel for TDE Kicker provides the TDE panel on you desktop. It can be used as a program launcher and can load plugins to provide additional diff --git a/ubuntu/_base/tdebase/debian/kcontrol-trinity.install b/ubuntu/_base/tdebase/debian/kcontrol-trinity.install index cb83175eb..59870c34a 100644 --- a/ubuntu/_base/tdebase/debian/kcontrol-trinity.install +++ b/ubuntu/_base/tdebase/debian/kcontrol-trinity.install @@ -19,8 +19,6 @@ debian/tmp/opt/trinity/lib/trinity/kcm_background.la debian/tmp/opt/trinity/lib/trinity/kcm_background.so debian/tmp/opt/trinity/lib/trinity/kcm_bell.la debian/tmp/opt/trinity/lib/trinity/kcm_bell.so -debian/tmp/opt/trinity/lib/trinity/kcm_clock.la -debian/tmp/opt/trinity/lib/trinity/kcm_clock.so debian/tmp/opt/trinity/lib/trinity/kcm_colors.la debian/tmp/opt/trinity/lib/trinity/kcm_colors.so debian/tmp/opt/trinity/lib/trinity/kcm_componentchooser.la @@ -59,8 +57,6 @@ debian/tmp/opt/trinity/lib/trinity/kcm_tdednssd.so debian/tmp/opt/trinity/lib/trinity/kcm_tdednssd.la debian/tmp/opt/trinity/lib/trinity/kcm_keys.la debian/tmp/opt/trinity/lib/trinity/kcm_keys.so -debian/tmp/opt/trinity/lib/trinity/kcm_kicker.la -debian/tmp/opt/trinity/lib/trinity/kcm_kicker.so debian/tmp/opt/trinity/lib/trinity/kcm_tdeio.la debian/tmp/opt/trinity/lib/trinity/kcm_tdeio.so debian/tmp/opt/trinity/lib/trinity/kcm_knotify.la @@ -97,8 +93,6 @@ debian/tmp/opt/trinity/lib/trinity/kcm_spellchecking.la debian/tmp/opt/trinity/lib/trinity/kcm_spellchecking.so debian/tmp/opt/trinity/lib/trinity/kcm_style.la debian/tmp/opt/trinity/lib/trinity/kcm_style.so -debian/tmp/opt/trinity/lib/trinity/kcm_taskbar.la -debian/tmp/opt/trinity/lib/trinity/kcm_taskbar.so debian/tmp/opt/trinity/lib/trinity/kcm_usb.la debian/tmp/opt/trinity/lib/trinity/kcm_usb.so debian/tmp/opt/trinity/lib/trinity/kcm_view1394.la @@ -163,7 +157,6 @@ debian/tmp/opt/trinity/share/applications/tde/kcmlaunch.desktop debian/tmp/opt/trinity/share/applications/tde/kcmnotify.desktop debian/tmp/opt/trinity/share/applications/tde/kcmperformance.desktop debian/tmp/opt/trinity/share/applications/tde/kcmsmserver.desktop -debian/tmp/opt/trinity/share/applications/tde/kcmtaskbar.desktop debian/tmp/opt/trinity/share/applications/tde/kcmusb.desktop debian/tmp/opt/trinity/share/applications/tde/kcmview1394.desktop debian/tmp/opt/trinity/share/applications/tde/KControl.desktop @@ -206,8 +199,6 @@ debian/tmp/opt/trinity/share/applnk/.hidden/fileappearance.desktop debian/tmp/opt/trinity/share/applnk/.hidden/filebehavior.desktop debian/tmp/opt/trinity/share/applnk/.hidden/filepreviews.desktop debian/tmp/opt/trinity/share/applnk/.hidden/kcmkonqyperformance.desktop -debian/tmp/opt/trinity/share/applnk/.hidden/kicker_config_appearance.desktop -debian/tmp/opt/trinity/share/applnk/.hidden/kicker_config.desktop debian/tmp/opt/trinity/share/applnk/.hidden/randr.desktop debian/tmp/opt/trinity/share/applnk/.hidden/smb.desktop debian/tmp/opt/trinity/share/applnk/.hidden/xinerama.desktop diff --git a/ubuntu/_base/tdebase/debian/kicker-trinity.install b/ubuntu/_base/tdebase/debian/kicker-trinity.install index 5133bcb90..31b3bb2c9 100644 --- a/ubuntu/_base/tdebase/debian/kicker-trinity.install +++ b/ubuntu/_base/tdebase/debian/kicker-trinity.install @@ -13,6 +13,12 @@ debian/tmp/opt/trinity/lib/trinity/extensionproxy.la debian/tmp/opt/trinity/lib/trinity/extensionproxy.so debian/tmp/opt/trinity/lib/trinity/kasbar_panelextension.la debian/tmp/opt/trinity/lib/trinity/kasbar_panelextension.so +debian/tmp/opt/trinity/lib/trinity/kcm_clock.la +debian/tmp/opt/trinity/lib/trinity/kcm_clock.so +debian/tmp/opt/trinity/lib/trinity/kcm_kicker.la +debian/tmp/opt/trinity/lib/trinity/kcm_kicker.so +debian/tmp/opt/trinity/lib/trinity/kcm_taskbar.la +debian/tmp/opt/trinity/lib/trinity/kcm_taskbar.so debian/tmp/opt/trinity/lib/trinity/kicker.la debian/tmp/opt/trinity/lib/trinity/kickermenu_find.la debian/tmp/opt/trinity/lib/trinity/kickermenu_find.so @@ -71,6 +77,9 @@ debian/tmp/opt/trinity/lib/libtaskmanager.so.1.0.0 debian/tmp/opt/trinity/lib/libkickoffsearch_interfaces.so.0 debian/tmp/opt/trinity/lib/libkickoffsearch_interfaces.so.0.0.0 debian/tmp/opt/trinity/share/applications/tde/kcmkicker.desktop +debian/tmp/opt/trinity/share/applications/tde/kcmtaskbar.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/kicker_config.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/kicker_config_appearance.desktop debian/tmp/opt/trinity/share/applnk/.hidden/kicker_config_arrangement.desktop debian/tmp/opt/trinity/share/applnk/.hidden/kicker_config_hiding.desktop debian/tmp/opt/trinity/share/applnk/.hidden/kicker_config_menus.desktop -- cgit v1.2.1