From e22f8f344bf13e0141e12d0969b89792a1494b49 Mon Sep 17 00:00:00 2001
From: Modestas Vainius <modestas@vainius.eu>
Date: Sat, 8 Aug 2009 10:36:01 +0300
Subject: [PATCH] Prefer *-qt3 binary names to generic ones in FinqQt3.cmake.

This closes: #538864.
---
 debian/changelog                  |  7 +++++++
 debian/patches/FindQt3.cmake.diff | 23 +++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 31 insertions(+)
 create mode 100644 debian/patches/FindQt3.cmake.diff

diff --git a/debian/changelog b/debian/changelog
index 6f1ffec68..f22fb4573 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cmake (2.6.4-2) UNRELEASED; urgency=low
+
+  * Prefer *-qt3 binary names to generic ones in FinqQt3.cmake
+    (Closes: #538864).
+
+ -- Modestas Vainius <modestas@vainius.eu>  Sat, 08 Aug 2009 10:34:21 +0300
+
 cmake (2.6.4-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/FindQt3.cmake.diff b/debian/patches/FindQt3.cmake.diff
new file mode 100644
index 000000000..8259caf9e
--- /dev/null
+++ b/debian/patches/FindQt3.cmake.diff
@@ -0,0 +1,23 @@
+Prefer *-qt3 binaries to generic names which might come from Qt4
+
+--- a/Modules/FindQt3.cmake
++++ b/Modules/FindQt3.cmake
+@@ -125,7 +125,7 @@
+ 
+ # qt 3 should prefer QTDIR over the PATH
+ FIND_PROGRAM(QT_MOC_EXECUTABLE
+-  NAMES moc moc-qt3
++  NAMES moc-qt3 moc
+   HINTS
+   $ENV{QTDIR}/bin
+   PATHS
+@@ -147,7 +147,8 @@
+ ENDIF(QT_MOC_EXECUTABLE)
+ 
+ # qt 3 should prefer QTDIR over the PATH
+-FIND_PROGRAM(QT_UIC_EXECUTABLE uic
++FIND_PROGRAM(QT_UIC_EXECUTABLE
++  NAMES uic-qt3 uic
+   HINTS
+   $ENV{QTDIR}/bin
+   PATHS
diff --git a/debian/patches/series b/debian/patches/series
index 657bb4f8b..d2396e740 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 FindQt4.cmake2.6.diff
+FindQt3.cmake.diff
 findmpeg2-addpath.diff
 kfreebsd-Platform.diff
 executables-dont-need-fpic.diff