summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/tdebase/debian
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-03-29 16:55:59 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-03-29 16:58:37 -0500
commitcbca0a26de2f4cd4f8ba77dd749fcc0898809bf8 (patch)
treece0e63abc695d9b8fd231b37a705687fdd6bc46c /ubuntu/maverick/tdebase/debian
parent66dd7cea5a5a984098cffd602a388b28ec4670f7 (diff)
downloadtde-packaging-cbca0a26de2f4cd4f8ba77dd749fcc0898809bf8.tar.gz
tde-packaging-cbca0a26de2f4cd4f8ba77dd749fcc0898809bf8.zip
Fix conflict between libkonq4-trinity and konqueror-trinity
Diffstat (limited to 'ubuntu/maverick/tdebase/debian')
-rw-r--r--ubuntu/maverick/tdebase/debian/konqueror-trinity.install1
-rw-r--r--ubuntu/maverick/tdebase/debian/libkonq4-trinity.install1
2 files changed, 1 insertions, 1 deletions
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-trinity.install b/ubuntu/maverick/tdebase/debian/konqueror-trinity.install
index 72260cdb6..562eec1f3 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/konqueror-trinity.install
@@ -156,6 +156,7 @@ debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/text-tcl-print.desktop
debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/text-tex-print.desktop
debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/text-xml-print.desktop
debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/text-xslt-print.desktop
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/edit-as-root.desktop
debian/tmp/opt/trinity/share/apps/konqueror/tiles/bluemorning.png
debian/tmp/opt/trinity/share/apps/konqueror/tiles/canvas.png
debian/tmp/opt/trinity/share/apps/konqueror/tiles/kde4ever.png
diff --git a/ubuntu/maverick/tdebase/debian/libkonq4-trinity.install b/ubuntu/maverick/tdebase/debian/libkonq4-trinity.install
index a76a548dc..15ee2a8d3 100644
--- a/ubuntu/maverick/tdebase/debian/libkonq4-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/libkonq4-trinity.install
@@ -12,6 +12,5 @@ debian/tmp/opt/trinity/share/apps/konqueror/pics/arrow_bottomright.png
debian/tmp/opt/trinity/share/apps/konqueror/pics/arrow_topleft.png
debian/tmp/opt/trinity/share/apps/konqueror/pics/arrow_topright.png
debian/tmp/opt/trinity/share/apps/konqueror/pics/thumbnailfont_7x4.png
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/edit-as-root.desktop
debian/tmp/opt/trinity/share/services/kded/favicons.desktop
debian/tmp/opt/trinity/share/servicetypes/konqpopupmenuplugin.desktop