summaryrefslogtreecommitdiffstats
path: root/ubuntu/precise/tdebase/debian
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-09-11 21:42:05 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-09-11 21:42:05 +0200
commitd8260a6ce3beb4f6aa74e66f9f9b56995a36d79e (patch)
treec9ce19741b0d33903ac7e6e267c5bcdeab17da8f /ubuntu/precise/tdebase/debian
parentd27e5e6838cded96c7f11370af49a74f5bab0aa8 (diff)
parente52ee671cbb3dfd521892b659f54cb4e647aca3d (diff)
downloadtde-packaging-d8260a6ce3beb4f6aa74e66f9f9b56995a36d79e.tar.gz
tde-packaging-d8260a6ce3beb4f6aa74e66f9f9b56995a36d79e.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/precise/tdebase/debian')
-rw-r--r--ubuntu/precise/tdebase/debian/control12
1 files changed, 6 insertions, 6 deletions
diff --git a/ubuntu/precise/tdebase/debian/control b/ubuntu/precise/tdebase/debian/control
index b2a891a78..748ea8bf5 100644
--- a/ubuntu/precise/tdebase/debian/control
+++ b/ubuntu/precise/tdebase/debian/control
@@ -88,7 +88,7 @@ Section: tde
Architecture: any
Replaces: kcontrol-kde3 (<< 4:14.0.0), kcontrol-trinity (<< 4:14.0.0)
Breaks: kcontrol-kde3 (<< 4:14.0.0), kcontrol-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), usbutils
+Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}~), tdebase-data-trinity (<< ${KDE-Next-Version3}~), usbutils
Recommends: udev
Suggests: khelpcenter-trinity, ntpdate | ntp-simple
Conflicts: tdebase-libs-trinity (<< 4:3.0.0)
@@ -254,7 +254,7 @@ Section: tde
Architecture: any
Replaces: kdm-kde3 (<< 4:14.0.0), kdm-trinity (<< 4:14.0.0)
Breaks: kdm-kde3 (<< 4:14.0.0), kdm-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
+Depends: ${shlibs:Depends}, tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}~), tdebase-data-trinity (<< ${KDE-Next-Version3}~), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
Recommends: logrotate, xserver-xorg
Suggests: khelpcenter-trinity, ksmserver-trinity (= ${Source-Version}), tdepasswd-trinity (= ${Source-Version}), menu
Provides: x-display-manager
@@ -313,7 +313,7 @@ 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 (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}~), tdebase-data-trinity (<< ${KDE-Next-Version3}~)
Suggests: khelpcenter-trinity, kicker-applets-trinity, menu
Conflicts: tdebase-libs-trinity (<< 4:3.0.0)
Description: desktop panel for KDE
@@ -446,7 +446,7 @@ Section: tde
Architecture: any
Replaces: kpersonalizer-kde3 (<< 4:14.0.0), kpersonalizer-trinity (<< 4:14.0.0)
Breaks: kpersonalizer-kde3 (<< 4:14.0.0), kpersonalizer-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}~), tdebase-data-trinity (<< ${KDE-Next-Version3}~)
Description: installation personalizer for KDE
KDE Personalizer is the application that configures the KDE desktop for you.
It's a very useful wizard that allows you to quickly change the KDE desktop to
@@ -483,7 +483,7 @@ Section: tde
Architecture: any
Replaces: ksplash-kde3 (<< 4:14.0.0), ksplash-trinity (<< 4:14.0.0)
Breaks: ksplash-kde3 (<< 4:14.0.0), ksplash-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}~), tdebase-data-trinity (<< ${KDE-Next-Version3}~)
Suggests: khelpcenter-trinity
Description: the KDE splash screen
This package includes the KDE Splash screen, which is seen when
@@ -540,7 +540,7 @@ Replaces: kwin-kde3 (<< 4:14.0.0), kwin-trinity (<< 4:14.0.0)
Breaks: kwin-kde3 (<< 4:14.0.0), kwin-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Provides: x-window-manager
-Suggests: tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), kdesktop-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), kpager-trinity (= ${Source-Version}), kpersonalizer-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version})
+Suggests: tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}~), tdebase-data-trinity (<< ${KDE-Next-Version3}~), kdesktop-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), kpager-trinity (= ${Source-Version}), kpersonalizer-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version})
Conflicts: kde-window-manager-trinity (<< 7:3.5.0)
Description: the KDE window manager
This package contains the default X window manager for KDE.