summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-02-16 02:21:43 +0100
committerSlávek Banko <slavek.banko@axis.cz>2014-02-16 02:21:43 +0100
commitfcb296c8c91fff452448d8b1ec446e2aac3d79c1 (patch)
tree1811ce070df0dd05dc82380405020dd03eba12ea
parent6c9675c04530d9bddd99c3c44b5feb066036df43 (diff)
downloadtde-packaging-fcb296c8c91fff452448d8b1ec446e2aac3d79c1.tar.gz
tde-packaging-fcb296c8c91fff452448d8b1ec446e2aac3d79c1.zip
Fix files conflict in tork package on Debian and Ubuntu
-rw-r--r--debian/lenny/applications/tork/debian/tork-trinity.install2
-rw-r--r--debian/squeeze/applications/tork/debian/tork-trinity.install2
-rw-r--r--debian/wheezy/applications/tork/debian/tork-trinity.install2
-rw-r--r--ubuntu/maverick/applications/tork/debian/tork-trinity.install2
-rw-r--r--ubuntu/precise/applications/tork/debian/tork-trinity.install2
-rw-r--r--ubuntu/raring/applications/tork/debian/tork-trinity.install2
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/*