Fix files conflict in tork package on Debian and Ubuntu

11 years ago · fcb296c8c9
parent 6c9675c045
commit fcb296c8c9
6 changed files with 6 additions and 6 deletions
--- a/debian/lenny/applications/tork/debian/tork-trinity.install
+++ b/debian/lenny/applications/tork/debian/tork-trinity.install
@ -2,6 +2,6 @@ debian/tmp/opt/trinity/bin/*
 debian/tmp/usr/share/menu/tork-trinity
 debian/tmp/opt/trinity/share/pixmaps/tork.xpm
 debian/tmp/opt/trinity/share/man/*
-debian/tmp/opt/trinity/share/apps/tork/icons/hicolor/48x48/apps/tork.png
+debian/tmp/opt/trinity/share/apps/tork/icons/hicolor/48x48/apps/tork.png opt/trinity/share/icons/hicolor/48x48/apps
 debian/tmp/opt/trinity/share/applications/*
 debian/tmp/opt/trinity/share/apps/konqueror/*
--- a/debian/squeeze/applications/tork/debian/tork-trinity.install
+++ b/debian/squeeze/applications/tork/debian/tork-trinity.install
@ -2,6 +2,6 @@ debian/tmp/opt/trinity/bin/*
 debian/tmp/usr/share/menu/tork-trinity
 debian/tmp/opt/trinity/share/pixmaps/tork.xpm
 debian/tmp/opt/trinity/share/man/*
-debian/tmp/opt/trinity/share/apps/tork/icons/hicolor/48x48/apps/tork.png
+debian/tmp/opt/trinity/share/apps/tork/icons/hicolor/48x48/apps/tork.png opt/trinity/share/icons/hicolor/48x48/apps
 debian/tmp/opt/trinity/share/applications/*
 debian/tmp/opt/trinity/share/apps/konqueror/*
--- a/debian/wheezy/applications/tork/debian/tork-trinity.install
+++ b/debian/wheezy/applications/tork/debian/tork-trinity.install
@ -2,6 +2,6 @@ debian/tmp/opt/trinity/bin/*
 debian/tmp/usr/share/menu/tork-trinity
 debian/tmp/opt/trinity/share/pixmaps/tork.xpm
 debian/tmp/opt/trinity/share/man/*
-debian/tmp/opt/trinity/share/apps/tork/icons/hicolor/48x48/apps/tork.png
+debian/tmp/opt/trinity/share/apps/tork/icons/hicolor/48x48/apps/tork.png opt/trinity/share/icons/hicolor/48x48/apps
 debian/tmp/opt/trinity/share/applications/*
 debian/tmp/opt/trinity/share/apps/konqueror/*
--- a/ubuntu/maverick/applications/tork/debian/tork-trinity.install
+++ b/ubuntu/maverick/applications/tork/debian/tork-trinity.install
@ -2,6 +2,6 @@ debian/tmp/opt/trinity/bin/*
 debian/tmp/usr/share/menu/tork-trinity
 debian/tmp/opt/trinity/share/pixmaps/tork.xpm
 debian/tmp/opt/trinity/share/man/*
-debian/tmp/opt/trinity/share/apps/tork/icons/hicolor/48x48/apps/tork.png
+debian/tmp/opt/trinity/share/apps/tork/icons/hicolor/48x48/apps/tork.png opt/trinity/share/icons/hicolor/48x48/apps
 debian/tmp/opt/trinity/share/applications/*
 debian/tmp/opt/trinity/share/apps/konqueror/*
--- a/ubuntu/precise/applications/tork/debian/tork-trinity.install
+++ b/ubuntu/precise/applications/tork/debian/tork-trinity.install
@ -2,6 +2,6 @@ debian/tmp/opt/trinity/bin/*
 debian/tmp/usr/share/menu/tork-trinity
 debian/tmp/opt/trinity/share/pixmaps/tork.xpm
 debian/tmp/opt/trinity/share/man/*
-debian/tmp/opt/trinity/share/apps/tork/icons/hicolor/48x48/apps/tork.png
+debian/tmp/opt/trinity/share/apps/tork/icons/hicolor/48x48/apps/tork.png opt/trinity/share/icons/hicolor/48x48/apps
 debian/tmp/opt/trinity/share/applications/*
 debian/tmp/opt/trinity/share/apps/konqueror/*
--- a/ubuntu/raring/applications/tork/debian/tork-trinity.install
+++ b/ubuntu/raring/applications/tork/debian/tork-trinity.install
@ -2,6 +2,6 @@ debian/tmp/opt/trinity/bin/*
 debian/tmp/usr/share/menu/tork-trinity
 debian/tmp/opt/trinity/share/pixmaps/tork.xpm
 debian/tmp/opt/trinity/share/man/*
-debian/tmp/opt/trinity/share/apps/tork/icons/hicolor/48x48/apps/tork.png
+debian/tmp/opt/trinity/share/apps/tork/icons/hicolor/48x48/apps/tork.png opt/trinity/share/icons/hicolor/48x48/apps
 debian/tmp/opt/trinity/share/applications/*
 debian/tmp/opt/trinity/share/apps/konqueror/*