TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix conflict between libkonq4-trinity and konqueror-trinity

Browse Source 
(cherry picked from commit cbca0a26de)
v3.5.13-sru
Timothy Pearson 12 years ago committed by Slávek Banko
parent 31e68b1aee
commit a0e0dfaedc
6 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

1
debian/lenny/kdebase/debian/konqueror-trinity.install vendored
Unescape View File

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

1
debian/lenny/kdebase/debian/libkonq4-trinity.install vendored
Unescape View File

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

1
debian/squeeze/kdebase/debian/konqueror-trinity.install vendored
Unescape View File

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

1
debian/squeeze/kdebase/debian/libkonq4-trinity.install vendored
Unescape View File

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

1
ubuntu/maverick/kdebase/debian/konqueror-trinity.install
Unescape View File

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

1
ubuntu/maverick/kdebase/debian/libkonq4-trinity.install
Unescape View File

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

Write Preview
Loading…
Cancel
Save