From ed365f79238644554f50523b5aa62f48dfef749e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= Date: Sun, 16 Jan 2011 11:44:22 +0100 Subject: [PATCH] Dropped obsolete patch: FindTCL_fix_#600245.diff --- debian/changelog | 1 + debian/patches/FindTCL_fix_#600245.diff | 32 ------------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 debian/patches/FindTCL_fix_#600245.diff diff --git a/debian/changelog b/debian/changelog index e4c0782b1..b5a2d7912 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ cmake (2.8.4~rc1-1) UNRELEASED; urgency=low * New upstream release. - Dropped obsolete patches: + backport_fix_asm_support.diff + + FindTCL_fix_#600245.diff -- Kai Wasserbäch Sun, 16 Jan 2011 11:40:34 +0100 diff --git a/debian/patches/FindTCL_fix_#600245.diff b/debian/patches/FindTCL_fix_#600245.diff deleted file mode 100644 index 5b947edac..000000000 --- a/debian/patches/FindTCL_fix_#600245.diff +++ /dev/null @@ -1,32 +0,0 @@ -From: Kai Wasserbäch -Description: FindTCL.cmake switches variables in the FIND_LIBRARY invocation. - The FIND_LIBRARY() statement for TCL used the TK variables and vice versa. - This patch reverses that into the right usage. (Closes: #600245) -Last-Update: 2010-11-27 -Origin: vendor -Forwarded: http://cmake.org/Bug/view.php?id=11528 -Applied-Upstream: http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d95913e2 ---- - Modules/FindTCL.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/Modules/FindTCL.cmake -+++ b/Modules/FindTCL.cmake -@@ -104,7 +104,7 @@ ENDIF(WIN32) - FIND_LIBRARY(TCL_LIBRARY - NAMES - tcl -- tcl${TK_LIBRARY_VERSION} tcl${TCL_TCLSH_VERSION} tcl${TK_WISH_VERSION} -+ tcl${TCL_LIBRARY_VERSION} tcl${TCL_TCLSH_VERSION} tcl${TK_WISH_VERSION} - tcl86 tcl8.6 - tcl85 tcl8.5 - tcl84 tcl8.4 -@@ -117,7 +117,7 @@ FIND_LIBRARY(TCL_LIBRARY - FIND_LIBRARY(TK_LIBRARY - NAMES - tk -- tk${TCL_LIBRARY_VERSION} tk${TCL_TCLSH_VERSION} tk${TK_WISH_VERSION} -+ tk${TK_LIBRARY_VERSION} tk${TCL_TCLSH_VERSION} tk${TK_WISH_VERSION} - tk86 tk8.6 - tk85 tk8.5 - tk84 tk8.4 diff --git a/debian/patches/series b/debian/patches/series index 773d8cfcb..086169b1c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ FindPython_fix_#569321_and_#580503.diff fixup_manpages.diff -FindTCL_fix_#600245.diff