Resync patches.

Signed-off-by: Modestas Vainius <modestas@vainius.eu>

debian/changelog

@@ -1,8 +1,11 @@
 cmake (2.6.4-0r1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Resync patches:
+    - relative_path_fixes2.diff - removed, merged upstream;
+    - FindQt4_qt4_lupdate_lrelease.diff - removed, merged upstream.
 
- -- Modestas Vainius <modestas@vainius.eu>  Fri, 01 May 2009 17:45:20 +0300
+ -- Modestas Vainius <modestas@vainius.eu>  Fri, 01 May 2009 17:56:23 +0300
 
 cmake (2.6.3-2) unstable; urgency=low
 

debian/patches/FindQt4.cmake2.6.diff

@@ -1,6 +1,6 @@
 --- a/Modules/FindQt4.cmake
 +++ b/Modules/FindQt4.cmake
-@@ -1274,199 +1274,6 @@
+@@ -1357,199 +1357,6 @@
    QT_QUERY_QMAKE(QMAKE_LIBS_OPENGL "QMAKE_LIBS_OPENGL")
    SET (QT_QTOPENGL_LIB_DEPENDENCIES ${QT_QTOPENGL_LIB_DEPENDENCIES} ${QMAKE_LIBS_OPENGL})
    
@@ -200,7 +200,7 @@
    IF(Q_WS_X11)
      # X11 libraries Qt absolutely depends on
      QT_QUERY_QMAKE(QT_LIBS_X11 "QMAKE_LIBS_X11")
-@@ -1475,9 +1282,9 @@
+@@ -1558,9 +1365,9 @@
        STRING(REGEX REPLACE "-l" "" QT_X11_LIB "${QT_X11_LIB}")
        SET(QT_TMP_STR "QT_X11_${QT_X11_LIB}_LIBRARY")
        FIND_LIBRARY(${QT_TMP_STR} NAMES "${QT_X11_LIB}" PATHS ${QMAKE_LIBDIR_X11})

debian/patches/FindQt4_qt4_lupdate_lrelease.diff

@@ -1,18 +0,0 @@
---- a/Modules/FindQt4.cmake
-+++ b/Modules/FindQt4.cmake
-@@ -824,13 +824,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
-     )

debian/patches/manpage_friendly_docs.diff

@@ -1,5 +1,3 @@
-diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
-index 518f8a8..b64d9cd 100644
 --- a/Modules/FindBoost.cmake
 +++ b/Modules/FindBoost.cmake
 @@ -66,7 +66,7 @@
@@ -9,10 +7,8 @@ index 518f8a8..b64d9cd 100644
 -# ============================================================================
 +# ===================================== ============= ========================
  #
- # Variables used by this module, they can change the default behaviour and need to be set
- # before calling find_package:
-diff --git a/Modules/FindRTI.cmake b/Modules/FindRTI.cmake
-index 3bfa72d..f20a744 100644
+ # Variables used by this module, they can change the default behaviour and
+ # need to be set before calling find_package:
 --- a/Modules/FindRTI.cmake
 +++ b/Modules/FindRTI.cmake
 @@ -5,7 +5,7 @@

debian/patches/relative_path_fixes2.diff

@@ -1,38 +0,0 @@
-Improved error handling for cmLocalGenerator::Convert().
-
-Small inconsistency fix for the previous relative_path_fixes.diff patch.
---- a/Source/cmLocalGenerator.cxx
-+++ b/Source/cmLocalGenerator.cxx
-@@ -2127,25 +2127,17 @@
-                                       bool optional)
- {
-   const char* remotePath = this->GetRelativeRootPath(remote);
-+
-+  // The relative root must have a path (i.e. not FULL or NONE)
-+  assert(remotePath != 0);
-+
-   if(local && (!optional || this->UseRelativePaths))
-     {
-     std::vector<std::string> components;
-     std::string result;
--    switch(remote)
--      {
--      case HOME:
--      case HOME_OUTPUT:
--      case START:
--      case START_OUTPUT:
--        cmSystemTools::SplitPath(local, components);
--        result = this->ConvertToRelativePath(components, remotePath);
--        break;
--      case FULL:
--        result = remotePath;
--        break;
--      case NONE:
--        break;
--      }
-+
-+    cmSystemTools::SplitPath(local, components);
-+    result = this->ConvertToRelativePath(components, remotePath);
-     return this->ConvertToOutputFormat(result.c_str(), output);
-     }
-   else

debian/patches/series

@@ -2,6 +2,4 @@ FindQt4.cmake2.6.diff
 findmpeg2-addpath.diff
 kfreebsd-Platform.diff
 executables-dont-need-fpic.diff
-relative_path_fixes2.diff
-FindQt4_qt4_lupdate_lrelease.diff
 manpage_friendly_docs.diff