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>
pull/68/head
Michele Calgaro 4 years ago
parent 31a3b72cc0
commit 3f2b6cd690
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -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

@ -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

@ -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

@ -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.

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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.

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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.

@ -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

@ -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

Loading…
Cancel
Save