Fix conflict between libkonq4-trinity and konqueror-trinity

pull/3/head
Timothy Pearson 12 years ago
parent 66dd7cea5a
commit cbca0a26de

@ -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-tex-print.desktop
debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/text-xml-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/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/bluemorning.png
debian/tmp/opt/trinity/share/apps/konqueror/tiles/canvas.png debian/tmp/opt/trinity/share/apps/konqueror/tiles/canvas.png
debian/tmp/opt/trinity/share/apps/konqueror/tiles/kde4ever.png debian/tmp/opt/trinity/share/apps/konqueror/tiles/kde4ever.png

@ -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_topleft.png
debian/tmp/opt/trinity/share/apps/konqueror/pics/arrow_topright.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/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/services/kded/favicons.desktop
debian/tmp/opt/trinity/share/servicetypes/konqpopupmenuplugin.desktop debian/tmp/opt/trinity/share/servicetypes/konqpopupmenuplugin.desktop

@ -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-tex-print.desktop
debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/text-xml-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/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/bluemorning.png
debian/tmp/opt/trinity/share/apps/konqueror/tiles/canvas.png debian/tmp/opt/trinity/share/apps/konqueror/tiles/canvas.png
debian/tmp/opt/trinity/share/apps/konqueror/tiles/kde4ever.png debian/tmp/opt/trinity/share/apps/konqueror/tiles/kde4ever.png

@ -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_topleft.png
debian/tmp/opt/trinity/share/apps/konqueror/pics/arrow_topright.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/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/services/kded/favicons.desktop
debian/tmp/opt/trinity/share/servicetypes/konqpopupmenuplugin.desktop debian/tmp/opt/trinity/share/servicetypes/konqpopupmenuplugin.desktop

@ -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-tex-print.desktop
debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/text-xml-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/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/bluemorning.png
debian/tmp/opt/trinity/share/apps/konqueror/tiles/canvas.png debian/tmp/opt/trinity/share/apps/konqueror/tiles/canvas.png
debian/tmp/opt/trinity/share/apps/konqueror/tiles/kde4ever.png debian/tmp/opt/trinity/share/apps/konqueror/tiles/kde4ever.png

@ -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_topleft.png
debian/tmp/opt/trinity/share/apps/konqueror/pics/arrow_topright.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/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/services/kded/favicons.desktop
debian/tmp/opt/trinity/share/servicetypes/konqpopupmenuplugin.desktop debian/tmp/opt/trinity/share/servicetypes/konqpopupmenuplugin.desktop

@ -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-tex-print.desktop
debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/text-xml-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/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/bluemorning.png
debian/tmp/opt/trinity/share/apps/konqueror/tiles/canvas.png debian/tmp/opt/trinity/share/apps/konqueror/tiles/canvas.png
debian/tmp/opt/trinity/share/apps/konqueror/tiles/kde4ever.png debian/tmp/opt/trinity/share/apps/konqueror/tiles/kde4ever.png

@ -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_topleft.png
debian/tmp/opt/trinity/share/apps/konqueror/pics/arrow_topright.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/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/services/kded/favicons.desktop
debian/tmp/opt/trinity/share/servicetypes/konqpopupmenuplugin.desktop debian/tmp/opt/trinity/share/servicetypes/konqpopupmenuplugin.desktop

@ -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-tex-print.desktop
debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/text-xml-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/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/bluemorning.png
debian/tmp/opt/trinity/share/apps/konqueror/tiles/canvas.png debian/tmp/opt/trinity/share/apps/konqueror/tiles/canvas.png
debian/tmp/opt/trinity/share/apps/konqueror/tiles/kde4ever.png debian/tmp/opt/trinity/share/apps/konqueror/tiles/kde4ever.png

@ -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_topleft.png
debian/tmp/opt/trinity/share/apps/konqueror/pics/arrow_topright.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/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/services/kded/favicons.desktop
debian/tmp/opt/trinity/share/servicetypes/konqpopupmenuplugin.desktop debian/tmp/opt/trinity/share/servicetypes/konqpopupmenuplugin.desktop

@ -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-tex-print.desktop
debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/text-xml-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/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/bluemorning.png
debian/tmp/opt/trinity/share/apps/konqueror/tiles/canvas.png debian/tmp/opt/trinity/share/apps/konqueror/tiles/canvas.png
debian/tmp/opt/trinity/share/apps/konqueror/tiles/kde4ever.png debian/tmp/opt/trinity/share/apps/konqueror/tiles/kde4ever.png

@ -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_topleft.png
debian/tmp/opt/trinity/share/apps/konqueror/pics/arrow_topright.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/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/services/kded/favicons.desktop
debian/tmp/opt/trinity/share/servicetypes/konqpopupmenuplugin.desktop debian/tmp/opt/trinity/share/servicetypes/konqpopupmenuplugin.desktop

Loading…
Cancel
Save