This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository osgearth.
commit 8d5923514fc56d0c50616139f57870113bfe0cf8 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sat Dec 7 03:50:44 2013 +0100 Refresh cmake-FindMiniZip.patch. --- debian/changelog | 1 + debian/patches/cmake-FindMiniZip.patch | 50 ++++++++++++++++++---------------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6e551ed..2643566 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ osgearth (2.5.0+dfsg-1) UNRELEASED; urgency=medium * Enable KMZ support with libminizip from libkml. * Drop MPGeometry-OpenSceneGraph-3.1.8.patch, included in upstream. * Drop becuase-typo.patch, applied upstream. + * Refresh cmake-FindMiniZip.patch. -- Bas Couwenberg <sebas...@xs4all.nl> Thu, 16 Jan 2014 22:35:07 +0100 diff --git a/debian/patches/cmake-FindMiniZip.patch b/debian/patches/cmake-FindMiniZip.patch index 25b380c..11a2237 100644 --- a/debian/patches/cmake-FindMiniZip.patch +++ b/debian/patches/cmake-FindMiniZip.patch @@ -3,30 +3,32 @@ Author: Bas Couwenberg <sebas...@xs4all.nl> Last-Update: 2013-10-09 --- a/CMakeModules/FindMiniZip.cmake +++ b/CMakeModules/FindMiniZip.cmake -@@ -15,6 +15,7 @@ FIND_PATH(MINIZIP_INCLUDE_DIR zip.h - ~/Library/Frameworks - /Library/Frameworks - /usr/local/include -+ /usr/include/minizip - /usr/include - /sw/include # Fink - /opt/local/include # DarwinPorts -@@ -36,6 +37,7 @@ FIND_LIBRARY(MINIZIP_LIBRARY - ~/Library/Frameworks - /Library/Frameworks - /usr/local/lib -+ /usr/lib/${DEB_HOST_MULTIARCH} - /usr/lib - /sw/lib - /opt/local/lib -@@ -51,4 +53,7 @@ IF(MINIZIP_LIBRARY AND MINIZIP_INCLUDE_D - ADD_DEFINITIONS(-DOSGEARTH_HAVE_MINIZIP) - ENDIF(MINIZIP_LIBRARY AND MINIZIP_INCLUDE_DIR) - -+INCLUDE(FindPackageHandleStandardArgs) -+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MiniZip DEFAULT_MSG MINIZIP_LIBRARY MINIZIP_INCLUDE_DIR) -+MARK_AS_ADVANCED(MINIZIP_LIBRARY MINIZIP_INCLUDE_DIR) - +@@ -32,6 +32,7 @@ IF(NOT MINIZIP_FOUND) + ~/Library/Frameworks + /Library/Frameworks + /usr/local/include ++ /usr/include/minizip + /usr/include + /sw/include # Fink + /opt/local/include # DarwinPorts +@@ -53,6 +54,7 @@ IF(NOT MINIZIP_FOUND) + ~/Library/Frameworks + /Library/Frameworks + /usr/local/lib ++ /usr/lib/${DEB_HOST_MULTIARCH} + /usr/lib + /sw/lib + /opt/local/lib +@@ -67,4 +69,9 @@ IF(NOT MINIZIP_FOUND) + SET(MINIZIP_FOUND "YES") + ADD_DEFINITIONS(-DOSGEARTH_HAVE_MINIZIP) + ENDIF(MINIZIP_LIBRARY AND MINIZIP_INCLUDE_DIR) ++ ++ INCLUDE(FindPackageHandleStandardArgs) ++ FIND_PACKAGE_HANDLE_STANDARD_ARGS(MiniZip DEFAULT_MSG MINIZIP_LIBRARY MINIZIP_INCLUDE_DIR) ++ MARK_AS_ADVANCED(MINIZIP_LIBRARY MINIZIP_INCLUDE_DIR) ++ + ENDIF(NOT MINIZIP_FOUND) --- a/src/osgEarthDrivers/kml/KMZArchive +++ b/src/osgEarthDrivers/kml/KMZArchive @@ -27,7 +27,7 @@ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osgearth.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel