~ubuntu-branches/ubuntu/maverick/cmake/maverick-proposed

« back to all changes in this revision

Viewing changes to debian/patches/debian-changes-2.8.2-2ubuntu1

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-20 11:25:26 UTC
  • mfrom: (2.1.2 hoary) (3.3.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20101220112526-3ichv8oj0auqyt67
Tags: 2.8.2-2ubuntu0.1
Cherry pick 5850b8b79a813dbe8ad380c88878260cae3d7cbc from cmake 2.8.3 to
fix zlib.h processing to that using kdevelop for projects that use zlib is
not unusably slow (LP: #692595)

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Description: Upstream changes introduced in version 2.8.2-2ubuntu1
 
2
 This patch has been created by dpkg-source during the package build.
 
3
 Here's the last changelog entry, hopefully it gives details on why
 
4
 those changes were made:
 
5
 .
 
6
 cmake (2.8.2-2ubuntu1) natty; urgency=low
 
7
 .
 
8
   * Cherry pick 5850b8b79a813dbe8ad380c88878260cae3d7cbc from cmake 2.8.3 to
 
9
     fix zlib.h processing to that using kdevelop for projects that use zlib is
 
10
     not unusably slow (LP: #692595)
 
11
 .
 
12
 The person named in the Author field signed this changelog entry.
 
13
Author: Scott Kitterman <scott@kitterman.com>
 
14
Bug-Ubuntu: https://bugs.launchpad.net/bugs/692595
 
15
 
 
16
---
 
17
The information above should follow the Patch Tagging Guidelines, please
 
18
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
 
19
are templates for supplementary fields that you might want to add:
 
20
 
 
21
Origin: <vendor|upstream|other>, <url of original patch>
 
22
Bug: <url in upstream bugtracker>
 
23
Bug-Debian: http://bugs.debian.org/<bugnumber>
 
24
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
 
25
Forwarded: <no|not-needed|url proving that it has been forwarded>
 
26
Reviewed-By: <name and email of someone who approved the patch>
 
27
Last-Update: <YYYY-MM-DD>
 
28
 
 
29
--- cmake-2.8.2.orig/Modules/FindZLIB.cmake
 
30
+++ cmake-2.8.2/Modules/FindZLIB.cmake
 
31
@@ -38,7 +38,7 @@ MARK_AS_ADVANCED(ZLIB_LIBRARY ZLIB_INCLU
 
32
 
 
33
 IF (ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h")
 
34
     FILE(READ "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_H)
 
35
-    STRING(REGEX REPLACE ".*#define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+)\".*" "\\1.\\2.\\3" ZLIB_VERSION_STRING "${ZLIB_H}")
 
36
+    STRING(REGEX REPLACE ".*#define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+).*" "\\1.\\2.\\3" ZLIB_VERSION_STRING "${ZLIB_H}")
 
37
 ENDIF()
 
38
 
 
39
 # handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if