git » qt5-tools.git » commit 2f1fdb7

diff --git a/PKGBUILD b/PKGBUILD
index 927e1e2..c222bbe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=qt5-tools
 _qtver=5.7.0
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -14,14 +14,15 @@ depends=('qt5-base')
 makedepends=('qt5-declarative' 'qt5-webkit')
 optdepends=('qt5-doc: documentation' 'qt5-webkit: for Qt Assistant')
 groups=('qt' 'qt5')
+conflicts=('qtchooser')
 _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
 source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
         {assistant,designer,linguist,qdbusviewer}.desktop)
 md5sums=('29eb3fd31582b5801e264c62d1158553'
-         'b2897dd6a2967bccf8f10e397aafee55'
-         '76e150b20178d2d43801f7367232e5f7'
-         '188da8f4c87316e730ebf1c6217bf5a0'
-         '322b419b16c75d4de0ee7ad0a246caa1')
+         '4d5108891a3c0255af29e7640a29caed'
+         'f9a33d1e43ebf4ee9c6feda68feba64a'
+         '521eff2020e1397aa9b22caa17d4ee4b'
+         '05a8324f294da817b2fd3a59863a06f1')
 
 prepare() {
   mkdir -p build
@@ -60,10 +61,9 @@ package() {
   install -m644 "${srcdir}"/{linguist,designer,assistant,qdbusviewer}.desktop \
     "${pkgdir}/usr/share/applications/"
 
-  # Useful symlinks
-  install -d "${pkgdir}"/usr/bin
-  for b in "${pkgdir}"/usr/lib/qt/bin/*; do
-    ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
+  # Symlinks for backwards compatibility
+  for b in "${pkgdir}"/usr/bin/*; do
+    ln -s /usr/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
   done
 
   # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
diff --git a/assistant.desktop b/assistant.desktop
index 9d61004..c84bbd9 100644
--- a/assistant.desktop
+++ b/assistant.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Qt Assistant
 Comment=Shows Qt documentation and examples
-Exec=/usr/lib/qt/bin/assistant
+Exec=assistant
 Icon=assistant
 Terminal=false
 Type=Application
diff --git a/designer.desktop b/designer.desktop
index b39e77a..fc020ba 100644
--- a/designer.desktop
+++ b/designer.desktop
@@ -2,7 +2,7 @@
 Name=Qt Designer
 GenericName=Interface Designer
 Comment=Design GUIs for Qt applications
-Exec=/usr/lib/qt/bin/designer
+Exec=designer
 Icon=QtProject-designer
 MimeType=application/x-designer;
 Terminal=false
diff --git a/linguist.desktop b/linguist.desktop
index c6d1aa4..aa5696b 100644
--- a/linguist.desktop
+++ b/linguist.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Qt Linguist
 Comment=Add translations to Qt applications
-Exec=/usr/lib/qt/bin/linguist
+Exec=linguist
 Icon=linguist
 MimeType=text/vnd.trolltech.linguist;application/x-linguist;
 Terminal=false
diff --git a/qdbusviewer.desktop b/qdbusviewer.desktop
index 9165b6f..9b8ab2a 100644
--- a/qdbusviewer.desktop
+++ b/qdbusviewer.desktop
@@ -2,7 +2,7 @@
 Name=Qt QDbusViewer 
 GenericName=D-Bus Debugger
 Comment=Debug D-Bus applications
-Exec=/usr/lib/qt/bin/qdbusviewer
+Exec=qdbusviewer
 Icon=qdbusviewer
 Terminal=false
 Type=Application