Remove multiarch_lib_dirs_should_be_implicit.diff patch, merged upstream.

debian/changelog

@@ -3,6 +3,7 @@ cmake (2.8.7-0r1) UNRELEASED; urgency=low
   * New upstream release. (Closes: #658427)
   * Disable CTestTestUpload test because it requires Internet access. Thanks to
     Felix Geyer. (Closes: #634603)
+  * Remove multiarch_lib_dirs_should_be_implicit.diff patch, merged upstream.
 
  -- Modestas Vainius <modax@debian.org>  Sat, 18 Feb 2012 12:41:16 +0200
 

debian/patches/multiarch_lib_dirs_should_be_implicit.diff

@@ -1,33 +0,0 @@
-From: Modestas Vainius <modax@debian.org>
-Subject: Multiarch directories should be among implicit link directories as well
-Bug: http://public.kitware.com/Bug/view.php?id=12326
-Forwarded: yes
-Origin: vendor
-Last-Update: 2011-07-09
-
-Add multiarch library directories to the set of implicit link directories. In
-particular, this keeps /lib/<arch> out of R(UN)PATH of the binaries cmake
-builds.
-
---- a/Source/cmComputeLinkInformation.cxx
-+++ b/Source/cmComputeLinkInformation.cxx
-@@ -1603,6 +1603,19 @@ void cmComputeLinkInformation::LoadImpli
-     cmSystemTools::ExpandListArgument(implicitLinks, implicitDirVec);
-     }
- 
-+  // Append library architecture to all implicit platform directories
-+  // and add them to the set
-+  if(const char* libraryArch =
-+     (this->Makefile->GetDefinition
-+      ("CMAKE_LIBRARY_ARCHITECTURE")))
-+    {
-+    for (std::vector<std::string>::const_iterator i = implicitDirVec.begin();
-+         i != implicitDirVec.end(); ++i)
-+      {
-+      this->ImplicitLinkDirs.insert(*i + "/" + libraryArch);
-+      }
-+    }
-+
-   // Get language-specific implicit directories.
-   std::string implicitDirVar = "CMAKE_";
-   implicitDirVar += this->LinkLanguage;

debian/patches/series

@@ -1,3 +1,2 @@
 FindBoost_add_-lpthread_#563479.diff
 multiarch_findgtk2_fix.diff
-multiarch_lib_dirs_should_be_implicit.diff