diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-03-29 16:55:59 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-03-30 02:10:48 +0100 |
| commit | a0e0dfaedc4dd22ff73b4ba8d808899008856788 (patch) | |
| tree | 45c3040fc74db45116fc7aab8fcb498e5ca92130 /ubuntu/maverick | |
| parent | 31e68b1aeefc8552d398366bec5e58efd56c4eed (diff) | |
| download | tde-packaging-a0e0dfaedc4dd22ff73b4ba8d808899008856788.tar.gz tde-packaging-a0e0dfaedc4dd22ff73b4ba8d808899008856788.zip | |
Fix conflict between libkonq4-trinity and konqueror-trinity
(cherry picked from commit cbca0a26de2f4cd4f8ba77dd749fcc0898809bf8)
Diffstat (limited to 'ubuntu/maverick')
| -rw-r--r-- | ubuntu/maverick/kdebase/debian/konqueror-trinity.install | 1 | ||||
| -rw-r--r-- | ubuntu/maverick/kdebase/debian/libkonq4-trinity.install | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/ubuntu/maverick/kdebase/debian/konqueror-trinity.install b/ubuntu/maverick/kdebase/debian/konqueror-trinity.install index a570c2437..683cf364e 100644 --- a/ubuntu/maverick/kdebase/debian/konqueror-trinity.install +++ b/ubuntu/maverick/kdebase/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/kdebase/debian/libkonq4-trinity.install b/ubuntu/maverick/kdebase/debian/libkonq4-trinity.install index 6cad9785f..77ea07f1a 100644 --- a/ubuntu/maverick/kdebase/debian/libkonq4-trinity.install +++ b/ubuntu/maverick/kdebase/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 |