Lubuntu/cmake
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New upstream release.

Browse Source 
* Add myself to Uploaders.
* Build-Depend on liblzma-dev and libjsoncpp-dev.
* Drop patches merged upstream:
  - fix-FindImageMagick-1.diff
  - fix-FindImageMagick-2.diff
  - FindJNI_ppc64le.diff
  - hurd_host_system_processor.diff
* Refresh patches:
  - FindBoost_add_-lpthread_#563479.diff
  - FindJNI.cmake.mips.patch
  - fix-ftbfs-on-kfreebsd.patch
  - fix-hdf5-hl.patch
  - qt_import_dir_variable.diff
* Bump Standards-Version to 3.9.6.
* Fix "Typo in cpack documentation" by adding new patch cpack-doc-typo.patch
  (Closes: #760298)
This commit is contained in:
Mario Lang 2015-04-28 09:04:07 +02:00
parent 824dd175df
commit ca75aed246
16 changed files with 70 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
debian/changelog vendored
View File

@ -1,3 +1,25 @@
cmake (3.2.2-1) UNRELEASED; urgency=low
* New upstream release (Closes: Bug#780704).
* Add myself to Uploaders.
* Build-Depend on liblzma-dev and libjsoncpp-dev.
* Drop patches merged upstream:
- fix-FindImageMagick-1.diff
- fix-FindImageMagick-2.diff
- FindJNI_ppc64le.diff
- hurd_host_system_processor.diff
* Refresh patches:
- FindBoost_add_-lpthread_#563479.diff
- FindJNI.cmake.mips.patch
- fix-ftbfs-on-kfreebsd.patch
- fix-hdf5-hl.patch
- qt_import_dir_variable.diff
* Bump Standards-Version to 3.9.6.
* Fix "Typo in cpack documentation" by adding new patch cpack-doc-typo.patch
(Closes: #760298)
-- Mario Lang <mlang@debian.org> Mon, 27 Apr 2015 22:31:13 +0200
cmake (3.0.2-1) unstable; urgency=medium
* New upstream release.

4
debian/cmake-data.install vendored
View File

@ -1,7 +1,7 @@
debian/cmake.xpm usr/share/pixmaps
usr/share/aclocal/cmake.m4
usr/share/cmake-3.0/*
usr/share/cmake-3.0/editors/emacs/cmake-mode.el usr/share/emacs/site-lisp
usr/share/cmake-3.2/*
usr/share/cmake-3.2/editors/emacs/cmake-mode.el usr/share/emacs/site-lisp
usr/share/man/man7/cmake-buildsystem.7
usr/share/man/man7/cmake-commands.7
usr/share/man/man7/cmake-developer.7

1
debian/cmake-qt-gui.install vendored
View File

@ -2,4 +2,3 @@ usr/bin/cmake-gui
usr/share/applications/CMake.desktop
usr/share/man/man1/cmake-gui.1
usr/share/mime/packages/cmakecache.xml
usr/share/pixmaps/CMakeSetup32.png

8
debian/control vendored
View File

@ -5,19 +5,21 @@ Maintainer: Modestas Vainius <modax@debian.org>
Uploaders: A. Maitland Bottoms <bottoms@debian.org>,
Kai Wasserbäch <curan@debian.org>,
Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>,
Felix Geyer <fgeyer@debian.org>
Felix Geyer <fgeyer@debian.org>,
Mario Lang <mlang@debian.org>
Build-Depends: bash-completion,
debhelper (>= 9.20131104),
libarchive-dev (>= 2.8.0),
libbz2-dev,
libcurl4-openssl-dev,
libexpat1-dev,
libjsoncpp-dev,
libncurses5-dev,
procps [!hurd-any],
python-sphinx,
libqt4-dev (>= 4.4.0),
zlib1g-dev
Standards-Version: 3.9.5
zlib1g-dev, liblzma-dev
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/collab-maint/cmake.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/cmake.git;a=summary
Homepage: http://cmake.org/

2
debian/copyright vendored
View File

@ -133,7 +133,7 @@ License: MIT-like
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:
.
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
.

10
debian/patches/FindBoost_add_-lpthread_#563479.diff vendored
View File

@ -7,9 +7,11 @@ Bug: http://cmake.org/Bug/view.php?id=10692
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=563479
Forwarded: http://cmake.org/Bug/file_download.php?file_id=3629&type=bug
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -409,6 +409,22 @@ function(_Boost_GUESS_COMPILER_PREFIX _r
Index: cmake/Modules/FindBoost.cmake
===================================================================
--- cmake.orig/Modules/FindBoost.cmake
+++ cmake/Modules/FindBoost.cmake
@@ -447,6 +447,22 @@ function(_Boost_GUESS_COMPILER_PREFIX _r
set(${_ret} ${_boost_COMPILER} PARENT_SCOPE)
endfunction()
@ -32,7 +34,7 @@ Forwarded: http://cmake.org/Bug/file_download.php?file_id=3629&type=bug
#
# End functions/macros
#
@@ -1091,6 +1107,9 @@ if(Boost_FOUND)
@@ -1177,6 +1193,9 @@ if(Boost_FOUND)
list(APPEND Boost_LIBRARIES ${Boost_${UPPERCOMPONENT}_LIBRARY})
endif()
endforeach()

10
debian/patches/FindJNI.cmake.mips.patch vendored
View File

@ -7,14 +7,16 @@ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=747174
Add support for mips64 mips64el mipsn32 mipsn32el in
Modules/FindJNI.cmake.
--- a/Modules/FindJNI.cmake 2014-05-23 09:26:39.000000000 +0100
+++ b/Modules/FindJNI.cmake 2014-05-26 12:19:53.275844095 +0100
@@ -44,7 +44,7 @@ macro(java_append_library_directories _v
Index: cmake/Modules/FindJNI.cmake
===================================================================
--- cmake.orig/Modules/FindJNI.cmake
+++ cmake/Modules/FindJNI.cmake
@@ -53,7 +53,7 @@ macro(java_append_library_directories _v
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
# mips* machines are bi-endian mostly so processor does not tell
# endianess of the underlying system.
- set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb")
+ set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb" "mips64" "mips64el" "mipsn32" "mipsn32el")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le")
set(_java_libarch "ppc64le")
set(_java_libarch "ppc64" "ppc64le")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")

17
debian/patches/FindJNI_ppc64le.diff vendored
View File

@ -1,17 +0,0 @@
Description: FindJNI: Add ppc64le architecture
Author: Dinar Valeev <dvaleev@suse.com>
Origin: upstream, commit 18ac6713e8657cca8fc791bcd581a47a7be6ebce
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 669e3e2..6a496af 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -54,7 +54,7 @@ macro(java_append_library_directories _var)
# endianess of the underlying system.
set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb" "mips64" "mips64el" "mipsn32" "mipsn32el")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le")
- set(_java_libarch "ppc64le")
+ set(_java_libarch "ppc64" "ppc64le")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
set(_java_libarch "ppc64" "ppc")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")

13
debian/patches/cpack-doc-typo.patch vendored Normal file
View File

@ -0,0 +1,13 @@
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index 35259c4..4b66964 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -228,7 +228,7 @@
#
# List of four values that specify what project to install. The four values
# are: Build directory, Project Name, Project Component, Directory. If
-# omitted, CPack will build an installer that installers everything.
+# omitted, CPack will build an installer that installs everything.
#
# .. variable:: CPACK_SYSTEM_NAME
#

55
debian/patches/fix-FindImageMagick-1.diff vendored
View File

@ -1,55 +0,0 @@
From 6f5581c105d59ed00cc065b9ab9b3c8c0a441db3 Mon Sep 17 00:00:00 2001
From: bastien ROUCARIES <roucaries.bastien@gmail.com>
Date: Tue, 22 Jul 2014 22:24:15 +0200
Subject: [PATCH] FindImageMagick: Find arch include dir (#15007)
---
Modules/FindImageMagick.cmake | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
index f6c8b3a..33f95ce 100644
--- a/Modules/FindImageMagick.cmake
+++ b/Modules/FindImageMagick.cmake
@@ -115,7 +115,19 @@ function(FIND_IMAGEMAGICK_API component header)
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
PATH_SUFFIXES
ImageMagick ImageMagick-6
- DOC "Path to the ImageMagick include dir."
+ DOC "Path to the ImageMagick arch-independent include dir."
+ )
+ find_path(ImageMagick_${component}_ARCH_INCLUDE_DIR
+ NAMES magick/magick-baseconfig.h
+ HINTS
+ ${PC_${component}_INCLUDEDIR}
+ ${PC_${component}_INCLUDE_DIRS}
+ PATHS
+ ${ImageMagick_INCLUDE_DIRS}
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
+ PATH_SUFFIXES
+ ImageMagick ImageMagick-6
+ DOC "Path to the ImageMagick arch-specific include dir."
)
find_library(ImageMagick_${component}_LIBRARY
NAMES ${ARGN}
@@ -127,12 +139,17 @@ function(FIND_IMAGEMAGICK_API component header)
DOC "Path to the ImageMagick Magick++ library."
)
+ # old version have only indep dir
if(ImageMagick_${component}_INCLUDE_DIR AND ImageMagick_${component}_LIBRARY)
set(ImageMagick_${component}_FOUND TRUE PARENT_SCOPE)
list(APPEND ImageMagick_INCLUDE_DIRS
${ImageMagick_${component}_INCLUDE_DIR}
)
+ if(ImageMagick_${component}_ARCH_INCLUDE_DIR)
+ list(APPEND ImageMagick_INCLUDE_DIRS
+ ${ImageMagick_${component}_ARCH_INCLUDE_DIR})
+ endif()
list(REMOVE_DUPLICATES ImageMagick_INCLUDE_DIRS)
set(ImageMagick_INCLUDE_DIRS ${ImageMagick_INCLUDE_DIRS} PARENT_SCOPE)
--
1.7.10.4

41
debian/patches/fix-FindImageMagick-2.diff vendored
View File

@ -1,41 +0,0 @@
From 1342e0222fed06f748f266a3a4e82c907cb76726 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 23 Jul 2014 15:33:48 -0400
Subject: [PATCH] FindImageMagick: Provide per-component include dirs (#15007)
Set the ImageMagick_<component>_INCLUDE_DIRS variable that is mentioned
in the documentation but was not set before.
---
Modules/FindImageMagick.cmake | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
index 33f95ce..65458b7 100644
--- a/Modules/FindImageMagick.cmake
+++ b/Modules/FindImageMagick.cmake
@@ -143,13 +143,20 @@ function(FIND_IMAGEMAGICK_API component header)
if(ImageMagick_${component}_INCLUDE_DIR AND ImageMagick_${component}_LIBRARY)
set(ImageMagick_${component}_FOUND TRUE PARENT_SCOPE)
- list(APPEND ImageMagick_INCLUDE_DIRS
+ # Construct per-component include directories.
+ set(ImageMagick_${component}_INCLUDE_DIRS
${ImageMagick_${component}_INCLUDE_DIR}
)
if(ImageMagick_${component}_ARCH_INCLUDE_DIR)
- list(APPEND ImageMagick_INCLUDE_DIRS
+ list(APPEND ImageMagick_${component}_INCLUDE_DIRS
${ImageMagick_${component}_ARCH_INCLUDE_DIR})
endif()
+ list(REMOVE_DUPLICATES ImageMagick_${component}_INCLUDE_DIRS)
+ set(ImageMagick_${component}_INCLUDE_DIRS
+ ${ImageMagick_${component}_INCLUDE_DIRS} PARENT_SCOPE)
+
+ # Add the per-component include directories to the full include dirs.
+ list(APPEND ImageMagick_INCLUDE_DIRS ${ImageMagick_${component}_INCLUDE_DIRS})
list(REMOVE_DUPLICATES ImageMagick_INCLUDE_DIRS)
set(ImageMagick_INCLUDE_DIRS ${ImageMagick_INCLUDE_DIRS} PARENT_SCOPE)
--
1.7.10.4

8
debian/patches/fix-ftbfs-on-kfreebsd.patch vendored
View File

@ -14,9 +14,11 @@ all places.
[1] https://buildd.debian.org/status/fetch.php?pkg=cmake&arch=kfreebsd-amd64&ver=2.8.12-1&stamp=1383507045
--- a/Source/kwsys/SystemInformation.cxx
+++ b/Source/kwsys/SystemInformation.cxx
@@ -130,7 +130,7 @@ typedef int siginfo_t;
Index: cmake/Source/kwsys/SystemInformation.cxx
===================================================================
--- cmake.orig/Source/kwsys/SystemInformation.cxx
+++ cmake/Source/kwsys/SystemInformation.cxx
@@ -125,7 +125,7 @@ typedef int siginfo_t;
# endif
#endif

8
debian/patches/fix-hdf5-hl.patch vendored
View File

@ -2,11 +2,11 @@ Description: Define HDF5_{Fortran_,}HL_COMPILE_LINE
so that HDF5_{Fortran_,}HL_INCLUDE_DIR and HDF5_{Fortran_,}HL_LIBRARIES
are found when the macro is invoked for HL and Fortran_HL components.
Author: Gilles Filippini <pini@debian.org>
Index: cmake-2.8.12.1/Modules/FindHDF5.cmake
Index: cmake/Modules/FindHDF5.cmake
===================================================================
--- cmake-2.8.12.1.orig/Modules/FindHDF5.cmake 2013-11-05 20:07:22.000000000 +0100
+++ cmake-2.8.12.1/Modules/FindHDF5.cmake 2014-07-26 11:39:19.785790997 +0200
@@ -210,6 +210,8 @@
--- cmake.orig/Modules/FindHDF5.cmake
+++ cmake/Modules/FindHDF5.cmake
@@ -223,6 +223,8 @@ if( NOT HDF5_FOUND )
_HDF5_invoke_compiler( C HDF5_C_COMPILE_LINE HDF5_C_RETURN_VALUE )
_HDF5_invoke_compiler( CXX HDF5_CXX_COMPILE_LINE HDF5_CXX_RETURN_VALUE )
_HDF5_invoke_compiler( Fortran HDF5_Fortran_COMPILE_LINE HDF5_Fortran_RETURN_VALUE )

28
debian/patches/hurd_host_system_processor.diff vendored
View File

@ -1,28 +0,0 @@
From 89d7a5a417dccbdc97107d30a6678e94ced9ca5d Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx@ubuntu.com>
Date: Wed, 10 Sep 2014 08:55:00 -0400
Subject: [PATCH] Fix CMAKE_HOST_SYSTEM_PROCESSOR detection on GNU/Hurd
(#15147)
On Debian GNU/Hurd 'uname -p' prints "unknown", so use 'uname -m'
instead.
---
Modules/CMakeDetermineSystem.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
index 1c0941a..fe292ea 100644
--- a/Modules/CMakeDetermineSystem.cmake
+++ b/Modules/CMakeDetermineSystem.cmake
@@ -47,7 +47,7 @@ if(CMAKE_HOST_UNIX)
if(CMAKE_UNAME)
exec_program(uname ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_NAME)
exec_program(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION)
- if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*|Darwin")
+ if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*|Darwin|^GNU$")
exec_program(uname ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
RETURN_VALUE val)
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND
--
1.7.10.4

8
debian/patches/qt_import_dir_variable.diff vendored
View File

@ -8,9 +8,11 @@ Origin: vendor
This happens when there are no plugins currently installed.
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -758,7 +758,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
Index: cmake/Modules/FindQt4.cmake
===================================================================
--- cmake.orig/Modules/FindQt4.cmake
+++ cmake/Modules/FindQt4.cmake
@@ -734,7 +734,7 @@ if (QT_QMAKE_EXECUTABLE AND
if (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED)
_qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir)
if(qt_imports_dir)

5
debian/patches/series vendored
View File

@ -2,8 +2,5 @@ FindBoost_add_-lpthread_#563479.diff
qt_import_dir_variable.diff
fix-ftbfs-on-kfreebsd.patch
FindJNI.cmake.mips.patch
fix-FindImageMagick-1.diff
fix-FindImageMagick-2.diff
fix-hdf5-hl.patch
FindJNI_ppc64le.diff
hurd_host_system_processor.diff
cpack-doc-typo.patch