From fcb296c8c91fff452448d8b1ec446e2aac3d79c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 16 Feb 2014 02:21:43 +0100 Subject: [PATCH] Fix files conflict in tork package on Debian and Ubuntu --- debian/lenny/applications/tork/debian/tork-trinity.install | 2 +- debian/squeeze/applications/tork/debian/tork-trinity.install | 2 +- debian/wheezy/applications/tork/debian/tork-trinity.install | 2 +- ubuntu/maverick/applications/tork/debian/tork-trinity.install | 2 +- ubuntu/precise/applications/tork/debian/tork-trinity.install | 2 +- ubuntu/raring/applications/tork/debian/tork-trinity.install | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/lenny/applications/tork/debian/tork-trinity.install b/debian/lenny/applications/tork/debian/tork-trinity.install index 3a69b5a76..ff343137a 100644 --- 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/* diff --git a/debian/squeeze/applications/tork/debian/tork-trinity.install b/debian/squeeze/applications/tork/debian/tork-trinity.install index 3a69b5a76..ff343137a 100644 --- 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/* diff --git a/debian/wheezy/applications/tork/debian/tork-trinity.install b/debian/wheezy/applications/tork/debian/tork-trinity.install index 3a69b5a76..ff343137a 100644 --- 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/* diff --git a/ubuntu/maverick/applications/tork/debian/tork-trinity.install b/ubuntu/maverick/applications/tork/debian/tork-trinity.install index 3a69b5a76..ff343137a 100644 --- 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/* diff --git a/ubuntu/precise/applications/tork/debian/tork-trinity.install b/ubuntu/precise/applications/tork/debian/tork-trinity.install index 3a69b5a76..ff343137a 100644 --- 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/* diff --git a/ubuntu/raring/applications/tork/debian/tork-trinity.install b/ubuntu/raring/applications/tork/debian/tork-trinity.install index 3a69b5a76..ff343137a 100644 --- 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/*