Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

6 files changed, 12 insertions, 12 deletions

diff --git a/debian/lenny/tdebase/debian/control b/debian/lenny/tdebase/debian/control
index 6aa7c5c26..ee49c2d46 100644
--- a/debian/lenny/tdebase/debian/control
+++ b/debian/lenny/tdebase/debian/control
@@ -186,7 +186,7 @@ Architecture: any
 Replaces: kdebase-kio-plugins-trinity (<< 4:14.0.0~)
 Breaks: 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.
diff --git a/debian/squeeze/tdebase/debian/control b/debian/squeeze/tdebase/debian/control
index dd4394268..ab3607018 100644
--- a/debian/squeeze/tdebase/debian/control
+++ b/debian/squeeze/tdebase/debian/control
@@ -186,7 +186,7 @@ Architecture: any
 Replaces: kdebase-kio-plugins-trinity (<< 4:14.0.0~)
 Breaks: 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.
diff --git a/debian/wheezy/tdebase/debian/control b/debian/wheezy/tdebase/debian/control
index dd4394268..ab3607018 100644
--- a/debian/wheezy/tdebase/debian/control
+++ b/debian/wheezy/tdebase/debian/control
@@ -186,7 +186,7 @@ Architecture: any
 Replaces: kdebase-kio-plugins-trinity (<< 4:14.0.0~)
 Breaks: 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.
diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control
index 43bbe93b7..6f64b7cb0 100644
--- a/ubuntu/maverick/tdebase/debian/control
+++ b/ubuntu/maverick/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.
diff --git a/ubuntu/precise/tdebase/debian/control b/ubuntu/precise/tdebase/debian/control
index 43bbe93b7..6f64b7cb0 100644
--- a/ubuntu/precise/tdebase/debian/control
+++ b/ubuntu/precise/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.
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.