diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-11-20 20:52:06 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-11-20 20:52:06 +0100 |
| commit | 3efcc1c9c067ce2b44330ac8fa0b6b35929bfe93 (patch) | |
| tree | 9e3c6aaa6520fa9c307e0269a2df88166f841950 /ubuntu/raring | |
| parent | f0a3fcec33407b8f58343d0b63ce85c375e65917 (diff) | |
| parent | 99d25dc9450226d3232f7757239fa394e46a70c2 (diff) | |
| download | tde-packaging-3efcc1c9c067ce2b44330ac8fa0b6b35929bfe93.tar.gz tde-packaging-3efcc1c9c067ce2b44330ac8fa0b6b35929bfe93.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/raring')
| -rw-r--r-- | ubuntu/raring/tdebase/debian/control | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ubuntu/raring/tdebase/debian/control b/ubuntu/raring/tdebase/debian/control index 43bbe93b7..6f64b7cb0 100644 --- a/ubuntu/raring/tdebase/debian/control +++ b/ubuntu/raring/tdebase/debian/control @@ -186,7 +186,7 @@ Architecture: any Replaces: kdebase-kio-plugins-kde3 (<< 4:14.0.0~), kdebase-kio-plugins-trinity (<< 4:14.0.0~) Breaks: kdebase-kio-plugins-kde3 (<< 4:14.0.0~), kdebase-kio-plugins-trinity (<< 4:14.0.0~) Depends: ${shlibs:Depends}, kdesktop-trinity, libsasl2-modules, psmisc, man-db (>= 2.5.1-1) -Recommends: pmount, cryptsetup, kamera-trinity, tdemultimedia-tdeio-plugins-trinity +Recommends: udisks2 | udisks | pmount, cryptsetup, kamera-trinity, tdemultimedia-tdeio-plugins-trinity Suggests: khelpcenter-trinity, mtools Conflicts: tdebase-libs-trinity (<< 4:3.0.0), mediamanager Description: core I/O slaves for KDE @@ -194,7 +194,7 @@ Description: core I/O slaves for KDE others, file, http, ftp, smtp, pop and imap. . It also includes the media tdeioslave, which handles removable devices, - and which works best with procfs, udev, and pmount. Media + and which works best with procfs, udev, and udisks2/udisks/pmount. Media also extends the functionality of many other tdeioslaves. To use this service, please make sure that your user is a member of the plugdev group. |