From 192311b4280eb39b5739edcb14b103c3616cc8b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= Date: Sun, 16 Jan 2011 11:42:17 +0100 Subject: [PATCH] Dropped obsolete patche: backport_fix_asm_support.diff --- debian/changelog | 8 ++++++ debian/patches/backport_fix_asm_support.diff | 27 -------------------- debian/patches/series | 1 - 3 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 debian/patches/backport_fix_asm_support.diff diff --git a/debian/changelog b/debian/changelog index cd3ff23df..e4c0782b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +cmake (2.8.4~rc1-1) UNRELEASED; urgency=low + + * New upstream release. + - Dropped obsolete patches: + + backport_fix_asm_support.diff + + -- Kai Wasserbäch Sun, 16 Jan 2011 11:40:34 +0100 + cmake (2.8.3-3) experimental; urgency=low * Install documentation to /usr/share/cmake-data instead as it's the "base" diff --git a/debian/patches/backport_fix_asm_support.diff b/debian/patches/backport_fix_asm_support.diff deleted file mode 100644 index d6cdf1a66..000000000 --- a/debian/patches/backport_fix_asm_support.diff +++ /dev/null @@ -1,27 +0,0 @@ -From: Alex Neundorf -Subject: Include CMakeDetermineCompilerId in CMakeDetermineASMCompiler.cmake (#11467) -Forwarded: yes -Origin: backport commit:e3dfbf62fcd54f582057fcec7a7989ac73712e55 -Bug: http://public.kitware.com/Bug/view.php?id=11467 -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=608510 -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/cmake/+bug/695335 -Last-Update: 2010-11-17 -Applied-Upstream: 2.8.4 - -CMakeDetermineASMCompiler.cmake relied on that somebody else (usually -during enabling C or CXX) already included that file, and broke if that -was not the case. -Thanks to Louis for the patch - -Alex - ---- a/Modules/CMakeDetermineASMCompiler.cmake -+++ b/Modules/CMakeDetermineASMCompiler.cmake -@@ -65,6 +65,7 @@ IF(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_ - SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_GNU "--version") - SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_GNU "GNU assembler") - -+ INCLUDE(CMakeDetermineCompilerId) - CMAKE_DETERMINE_COMPILER_ID_VENDOR(ASM${ASM_DIALECT}) - - IF(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID) diff --git a/debian/patches/series b/debian/patches/series index a6807a6c7..773d8cfcb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ FindPython_fix_#569321_and_#580503.diff fixup_manpages.diff FindTCL_fix_#600245.diff -backport_fix_asm_support.diff