From 3f2b6cd690be5a79969394317165966f13c62fd6 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 5 Nov 2020 21:32:12 +0800 Subject: [PATCH] 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 --- debian/_base/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES | 6 ------ debian/_base/tdeaddons/debian/konq-plugins-trinity.install | 1 - debian/_base/tdeaddons/debian/rules | 3 --- debian/_base/tdebase/debian/control | 2 +- debian/_base/tdebase/debian/konqueror-trinity.install | 6 ------ .../tdebase/debian/tdebase-tdeio-plugins-trinity.install | 7 +++++++ dilos/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES | 6 ------ dilos/tdeaddons/debian/konq-plugins-trinity.install | 1 - dilos/tdeaddons/debian/rules | 3 --- dilos/tdebase/debian/control | 2 +- dilos/tdebase/debian/konqueror-trinity.install | 6 ------ dilos/tdebase/debian/tdebase-tdeio-plugins-trinity.install | 7 +++++++ ubuntu/_base/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES | 6 ------ ubuntu/_base/tdeaddons/debian/konq-plugins-trinity.install | 1 - ubuntu/_base/tdeaddons/debian/rules | 3 --- ubuntu/_base/tdebase/debian/control | 2 +- ubuntu/_base/tdebase/debian/konqueror-trinity.install | 6 ------ .../tdebase/debian/tdebase-tdeio-plugins-trinity.install | 7 +++++++ 18 files changed, 24 insertions(+), 51 deletions(-) diff --git a/debian/_base/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES index 4ce41232d..95ce4341c 100644 --- a/debian/_base/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ b/debian/_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/debian/_base/tdeaddons/debian/konq-plugins-trinity.install b/debian/_base/tdeaddons/debian/konq-plugins-trinity.install index 22bc62c71..804176757 100644 --- a/debian/_base/tdeaddons/debian/konq-plugins-trinity.install +++ b/debian/_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/debian/_base/tdeaddons/debian/rules b/debian/_base/tdeaddons/debian/rules index 29be50279..677ee562c 100755 --- a/debian/_base/tdeaddons/debian/rules +++ b/debian/_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/debian/_base/tdebase/debian/control b/debian/_base/tdebase/debian/control index f8f962ba3..688b72bd6 100644 --- a/debian/_base/tdebase/debian/control +++ b/debian/_base/tdebase/debian/control @@ -187,7 +187,7 @@ Breaks: kdebase-kio-plugins-trinity (<< 4:14.0.0~) 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/debian/_base/tdebase/debian/konqueror-trinity.install b/debian/_base/tdebase/debian/konqueror-trinity.install index f33e96dc5..d073e179d 100644 --- a/debian/_base/tdebase/debian/konqueror-trinity.install +++ b/debian/_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/debian/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.install b/debian/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.install index 269608685..9b8eec783 100644 --- a/debian/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.install +++ b/debian/_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 diff --git a/dilos/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES b/dilos/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES index 4ce41232d..95ce4341c 100644 --- a/dilos/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ b/dilos/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/dilos/tdeaddons/debian/konq-plugins-trinity.install b/dilos/tdeaddons/debian/konq-plugins-trinity.install index a78976309..b980b5302 100644 --- a/dilos/tdeaddons/debian/konq-plugins-trinity.install +++ b/dilos/tdeaddons/debian/konq-plugins-trinity.install @@ -1,7 +1,6 @@ debian/tmp/etc/trinity/translaterc debian/tmp/usr/bin/fsview debian/tmp/usr/bin/jpegorient -debian/tmp/usr/bin/tdeio_media_realfolder debian/tmp/usr/lib/*/trinity/konq_sidebarnews.la debian/tmp/usr/lib/*/trinity/konq_sidebarnews.so debian/tmp/usr/lib/*/trinity/konqsidebar_delicious.la diff --git a/dilos/tdeaddons/debian/rules b/dilos/tdeaddons/debian/rules index e5221df93..5dcd64890 100755 --- a/dilos/tdeaddons/debian/rules +++ b/dilos/tdeaddons/debian/rules @@ -54,6 +54,3 @@ binary-install/knewsticker-scripts-trinity:: binary-install/kate-plugins-trinity:: chmod 755 debian/kate-plugins-trinity/usr/share/apps/kate/scripts/html-tidy.sh - -install/konq-plugins-trinity:: - rm -f debian/tmp/usr/share/apps/konqueror/servicemenus/media_realfolder.desktop diff --git a/dilos/tdebase/debian/control b/dilos/tdebase/debian/control index 2d8140bd0..9342211e2 100644 --- a/dilos/tdebase/debian/control +++ b/dilos/tdebase/debian/control @@ -187,7 +187,7 @@ Breaks: kdebase-kio-plugins-trinity (<< 4:14.0.0~) 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/dilos/tdebase/debian/konqueror-trinity.install b/dilos/tdebase/debian/konqueror-trinity.install index 5d3b83611..f6a70d149 100644 --- a/dilos/tdebase/debian/konqueror-trinity.install +++ b/dilos/tdebase/debian/konqueror-trinity.install @@ -122,12 +122,6 @@ debian/tmp/usr/share/apps/konqueror/pics/indicator_noconnect.png debian/tmp/usr/share/apps/konqueror/pics/indicator_viewactive.png debian/tmp/usr/share/apps/konqueror/profiles/filemanagement debian/tmp/usr/share/apps/konqueror/profiles/webbrowsing -debian/tmp/usr/share/apps/konqueror/servicemenus/media_eject.desktop -debian/tmp/usr/share/apps/konqueror/servicemenus/media_lock.desktop -debian/tmp/usr/share/apps/konqueror/servicemenus/media_mount.desktop -debian/tmp/usr/share/apps/konqueror/servicemenus/media_safelyremove.desktop -debian/tmp/usr/share/apps/konqueror/servicemenus/media_unlock.desktop -debian/tmp/usr/share/apps/konqueror/servicemenus/media_unmount.desktop debian/tmp/usr/share/apps/konqueror/servicemenus/text-ada-print.desktop debian/tmp/usr/share/apps/konqueror/servicemenus/text-c++h-print.desktop debian/tmp/usr/share/apps/konqueror/servicemenus/text-ch-print.desktop diff --git a/dilos/tdebase/debian/tdebase-tdeio-plugins-trinity.install b/dilos/tdebase/debian/tdebase-tdeio-plugins-trinity.install index 0b7cc73c5..7279d0b56 100644 --- a/dilos/tdebase/debian/tdebase-tdeio-plugins-trinity.install +++ b/dilos/tdebase/debian/tdebase-tdeio-plugins-trinity.install @@ -86,6 +86,13 @@ debian/tmp/usr/lib/*/trinity/textthumbnail.la debian/tmp/usr/lib/*/trinity/textthumbnail.so debian/tmp/usr/share/applications/tde/kcmcgi.desktop debian/tmp/usr/share/applications/tde/kcmtrash.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/media_eject.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/media_lock.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/media_mount.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/media_realfolder.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/media_safelyremove.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/media_unlock.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/media_unmount.desktop debian/tmp/usr/share/apps/tdeio_finger/tdeio_finger.css debian/tmp/usr/share/apps/tdeio_finger/tdeio_finger.pl debian/tmp/usr/share/apps/tdeio_info/kde-info2html 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