Fix files conflict in tork package on Debian and Ubuntu

pull/3/head
Slávek Banko 11 years ago
parent 6c9675c045
commit fcb296c8c9

@ -2,6 +2,6 @@ debian/tmp/opt/trinity/bin/*
debian/tmp/usr/share/menu/tork-trinity debian/tmp/usr/share/menu/tork-trinity
debian/tmp/opt/trinity/share/pixmaps/tork.xpm debian/tmp/opt/trinity/share/pixmaps/tork.xpm
debian/tmp/opt/trinity/share/man/* 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/applications/*
debian/tmp/opt/trinity/share/apps/konqueror/* debian/tmp/opt/trinity/share/apps/konqueror/*

@ -2,6 +2,6 @@ debian/tmp/opt/trinity/bin/*
debian/tmp/usr/share/menu/tork-trinity debian/tmp/usr/share/menu/tork-trinity
debian/tmp/opt/trinity/share/pixmaps/tork.xpm debian/tmp/opt/trinity/share/pixmaps/tork.xpm
debian/tmp/opt/trinity/share/man/* 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/applications/*
debian/tmp/opt/trinity/share/apps/konqueror/* debian/tmp/opt/trinity/share/apps/konqueror/*

@ -2,6 +2,6 @@ debian/tmp/opt/trinity/bin/*
debian/tmp/usr/share/menu/tork-trinity debian/tmp/usr/share/menu/tork-trinity
debian/tmp/opt/trinity/share/pixmaps/tork.xpm debian/tmp/opt/trinity/share/pixmaps/tork.xpm
debian/tmp/opt/trinity/share/man/* 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/applications/*
debian/tmp/opt/trinity/share/apps/konqueror/* debian/tmp/opt/trinity/share/apps/konqueror/*

@ -2,6 +2,6 @@ debian/tmp/opt/trinity/bin/*
debian/tmp/usr/share/menu/tork-trinity debian/tmp/usr/share/menu/tork-trinity
debian/tmp/opt/trinity/share/pixmaps/tork.xpm debian/tmp/opt/trinity/share/pixmaps/tork.xpm
debian/tmp/opt/trinity/share/man/* 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/applications/*
debian/tmp/opt/trinity/share/apps/konqueror/* debian/tmp/opt/trinity/share/apps/konqueror/*

@ -2,6 +2,6 @@ debian/tmp/opt/trinity/bin/*
debian/tmp/usr/share/menu/tork-trinity debian/tmp/usr/share/menu/tork-trinity
debian/tmp/opt/trinity/share/pixmaps/tork.xpm debian/tmp/opt/trinity/share/pixmaps/tork.xpm
debian/tmp/opt/trinity/share/man/* 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/applications/*
debian/tmp/opt/trinity/share/apps/konqueror/* debian/tmp/opt/trinity/share/apps/konqueror/*

@ -2,6 +2,6 @@ debian/tmp/opt/trinity/bin/*
debian/tmp/usr/share/menu/tork-trinity debian/tmp/usr/share/menu/tork-trinity
debian/tmp/opt/trinity/share/pixmaps/tork.xpm debian/tmp/opt/trinity/share/pixmaps/tork.xpm
debian/tmp/opt/trinity/share/man/* 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/applications/*
debian/tmp/opt/trinity/share/apps/konqueror/* debian/tmp/opt/trinity/share/apps/konqueror/*

Loading…
Cancel
Save