From b164021d95e3f807f681b691ac06c37246c763ac Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Thu, 16 Oct 2008 10:49:19 +0300 Subject: [PATCH] Add patch to prefer lupdate-qt4 to lupdate and lrelease to lrelease-qt4 Signed-off-by: Modestas Vainius --- debian/changelog | 6 +++++- .../patches/FindQt4_qt4_lupdate_lrelease.diff | 18 ++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 debian/patches/FindQt4_qt4_lupdate_lrelease.diff diff --git a/debian/changelog b/debian/changelog index a83d82e77..5cc957441 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ cmake (2.6.2-2~pre1) UNRELEASED; urgency=low * Add Vcs fields. + * Add patches: + - FindQt4_qt4_lupdate_lrelease.diff - prefer lupdate-qt4 to lupdate and + lrelease-qt4 to lrelease. This is specific to Debian Qt4 + (Closes: #487528). - -- Modestas Vainius Wed, 15 Oct 2008 10:22:18 +0300 + -- Modestas Vainius Thu, 16 Oct 2008 10:46:44 +0300 cmake (2.6.2-1) experimental; urgency=low diff --git a/debian/patches/FindQt4_qt4_lupdate_lrelease.diff b/debian/patches/FindQt4_qt4_lupdate_lrelease.diff new file mode 100644 index 000000000..066ccbcd8 --- /dev/null +++ b/debian/patches/FindQt4_qt4_lupdate_lrelease.diff @@ -0,0 +1,18 @@ +--- a/Modules/FindQt4.cmake ++++ b/Modules/FindQt4.cmake +@@ -972,13 +972,13 @@ + ) + + FIND_PROGRAM(QT_LUPDATE_EXECUTABLE +- NAMES lupdate ++ NAMES lupdate-qt4 lupdate + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) + + FIND_PROGRAM(QT_LRELEASE_EXECUTABLE +- NAMES lrelease ++ NAMES lrelease-qt4 lrelease + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) diff --git a/debian/patches/series b/debian/patches/series index 0af1d6a9b..5a8c9d81a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ reinstate-arm.diff relative_path_fixes.diff relative_path_fixes2.diff manpage-generation-fixes.diff +FindQt4_qt4_lupdate_lrelease.diff