diff --git a/debian/changelog b/debian/changelog index 0d600a478..6b5d89ce4 100644 --- a/debian/changelog +++ b/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 Sat, 18 Feb 2012 12:41:16 +0200 diff --git a/debian/patches/multiarch_lib_dirs_should_be_implicit.diff b/debian/patches/multiarch_lib_dirs_should_be_implicit.diff deleted file mode 100644 index 6de3cbf2c..000000000 --- a/debian/patches/multiarch_lib_dirs_should_be_implicit.diff +++ /dev/null @@ -1,33 +0,0 @@ -From: Modestas Vainius -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/ 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::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; diff --git a/debian/patches/series b/debian/patches/series index 36185ddea..cc249dfeb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ FindBoost_add_-lpthread_#563479.diff multiarch_findgtk2_fix.diff -multiarch_lib_dirs_should_be_implicit.diff