DEB: Moved 'Open Medium System Folder' from tdeaddons to tdebase. Also

moved Konqueror's media service desktop files from konqueror-trinity to
tdebase-tdeio-plugins-trinity package for functionality consistency.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

6 files changed, 8 insertions, 17 deletions

diff --git a/ubuntu/_base/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 4ce41232d..95ce4341c 100644
--- a/ubuntu/_base/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -1,10 +1,4 @@
-removed "konq-plugins/mediarealfolder/media_realfolder.desktop /usr/share/services" in konq-plugins.install
-
 install adblocker files in konq-plugins.install
 
-Added debian/rules entry to remove /usr/share/apps/konqueror/servicemenus/media_realfolder.desktop before installation
- install/konq-plugins::
- 	rm -f debian/tmp/usr/share/apps/konqueror/servicemenus/media_realfolder.desktop
-
   * Stop tdeaddons meta-package depending on knewsticker-scripts, 
     it depends on stuff in universe
diff --git a/ubuntu/_base/tdeaddons/debian/konq-plugins-trinity.install b/ubuntu/_base/tdeaddons/debian/konq-plugins-trinity.install
index 22bc62c71..804176757 100644
--- a/ubuntu/_base/tdeaddons/debian/konq-plugins-trinity.install
+++ b/ubuntu/_base/tdeaddons/debian/konq-plugins-trinity.install
@@ -1,7 +1,6 @@
 debian/tmp/etc/trinity/translaterc
 debian/tmp/opt/trinity/bin/fsview
 debian/tmp/opt/trinity/bin/jpegorient
-debian/tmp/opt/trinity/bin/tdeio_media_realfolder
 debian/tmp/opt/trinity/lib/trinity/konq_sidebarnews.la
 debian/tmp/opt/trinity/lib/trinity/konq_sidebarnews.so
 debian/tmp/opt/trinity/lib/trinity/konqsidebar_delicious.la
diff --git a/ubuntu/_base/tdeaddons/debian/rules b/ubuntu/_base/tdeaddons/debian/rules
index 29be50279..677ee562c 100755
--- a/ubuntu/_base/tdeaddons/debian/rules
+++ b/ubuntu/_base/tdeaddons/debian/rules
@@ -51,6 +51,3 @@ binary-install/knewsticker-scripts-trinity::
 
 binary-install/kate-plugins-trinity::
 	chmod 755 debian/kate-plugins-trinity/opt/trinity/share/apps/kate/scripts/html-tidy.sh
-
-install/konq-plugins-trinity::
-	rm -f debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/media_realfolder.desktop
diff --git a/ubuntu/_base/tdebase/debian/control b/ubuntu/_base/tdebase/debian/control
index 921fad2a0..47fb1d56c 100644
--- a/ubuntu/_base/tdebase/debian/control
+++ b/ubuntu/_base/tdebase/debian/control
@@ -187,7 +187,7 @@ Breaks: kdebase-kio-plugins-kde3 (<< 4:14.0.0~), kdebase-kio-plugins-trinity (<<
 Depends: ${shlibs:Depends}, kdesktop-trinity, libsasl2-modules, psmisc, man-db (>= 2.5.1-1)
 Recommends: udisks2 | udisks | pmount, cryptsetup, kamera-trinity, tdebase-tdeio-smb-trinity, tdemultimedia-tdeio-plugins-trinity
 Suggests: khelpcenter-trinity, mtools
-Conflicts: tdebase-libs-trinity (<< 4:3.0.0), mediamanager
+Conflicts: tdebase-libs-trinity (<< 4:3.0.0), mediamanager, konq-plugins-trinity (<< 4:14.1.0~), konqueror-trinity (<< 4:14.1.0~)
 Description: core I/O slaves for TDE
  This package includes the base tdeioslaves. They include, amongst many
  others, file, http, ftp, smtp, pop and imap.
diff --git a/ubuntu/_base/tdebase/debian/konqueror-trinity.install b/ubuntu/_base/tdebase/debian/konqueror-trinity.install
index f33e96dc5..d073e179d 100644
--- a/ubuntu/_base/tdebase/debian/konqueror-trinity.install
+++ b/ubuntu/_base/tdebase/debian/konqueror-trinity.install
@@ -122,12 +122,6 @@ debian/tmp/opt/trinity/share/apps/konqueror/pics/indicator_noconnect.png
 debian/tmp/opt/trinity/share/apps/konqueror/pics/indicator_viewactive.png
 debian/tmp/opt/trinity/share/apps/konqueror/profiles/filemanagement
 debian/tmp/opt/trinity/share/apps/konqueror/profiles/webbrowsing
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/media_eject.desktop
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/media_lock.desktop
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/media_mount.desktop
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/media_unlock.desktop
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/media_unmount.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/text-ada-print.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/text-c++h-print.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/text-ch-print.desktop
diff --git a/ubuntu/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.install b/ubuntu/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.install
index 269608685..9b8eec783 100644
--- a/ubuntu/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.install
+++ b/ubuntu/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.install
@@ -86,6 +86,13 @@ debian/tmp/opt/trinity/lib/trinity/textthumbnail.la
 debian/tmp/opt/trinity/lib/trinity/textthumbnail.so
 debian/tmp/opt/trinity/share/applications/tde/kcmcgi.desktop
 debian/tmp/opt/trinity/share/applications/tde/kcmtrash.desktop
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/media_eject.desktop
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/media_lock.desktop
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/media_mount.desktop
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/media_realfolder.desktop
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/media_unlock.desktop
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/media_unmount.desktop
 debian/tmp/opt/trinity/share/apps/tdeio_finger/tdeio_finger.css
 debian/tmp/opt/trinity/share/apps/tdeio_finger/tdeio_finger.pl
 debian/tmp/opt/trinity/share/apps/tdeio_info/kde-info2html