summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base/tdeaddons/debian
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/_base/tdeaddons/debian')
-rw-r--r--ubuntu/_base/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES6
-rw-r--r--ubuntu/_base/tdeaddons/debian/konq-plugins-trinity.install1
-rwxr-xr-xubuntu/_base/tdeaddons/debian/rules3
3 files changed, 0 insertions, 10 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