This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository gmt.
commit 49962fc391b4846ea6eebb840ba2e3844d70dcc4
Author: Bas Couwenberg
Date: Tue Aug 25 12:50:50 2015 +0200
Mark patches as Applied-Upstream.
---
debian/patches/dont-use-timestamped-gzip.patch | 1 +
debian/patches/netcdf-library-regex.patch | 22 +++---
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/debian/patches/dont-use-timestamped-gzip.patch
b/debian/patches/dont-use-timestamped-gzip.patch
index adb8b23..670492e 100644
--- a/debian/patches/dont-use-timestamped-gzip.patch
+++ b/debian/patches/dont-use-timestamped-gzip.patch
@@ -1,6 +1,7 @@
Description: Don't use timestamped gzip for reproducible builds.
Author: Bas Couwenberg
Forwarded: http://gmt.soest.hawaii.edu/issues/759
+Applied-Upstream:
http://gmt.soest.hawaii.edu/projects/gmt/repository/revisions/14772
--- a/doc/rst/CMakeLists.txt
+++ b/doc/rst/CMakeLists.txt
diff --git a/debian/patches/netcdf-library-regex.patch
b/debian/patches/netcdf-library-regex.patch
index b925bd9..b771968 100644
--- a/debian/patches/netcdf-library-regex.patch
+++ b/debian/patches/netcdf-library-regex.patch
@@ -1,19 +1,35 @@
Description: Fix linker flag regex to not match '-l' in
'-L/usr/lib/x86_64-linux-gnu/hdf5/serial'.
Author: Bas Couwenberg
Forwarded: http://gmt.soest.hawaii.edu/issues/757
+Applied-Upstream:
http://gmt.soest.hawaii.edu/projects/gmt/repository/revisions/14773
--- a/cmake/modules/FindNETCDF.cmake
+++ b/cmake/modules/FindNETCDF.cmake
-@@ -58,8 +58,10 @@ if (UNIX AND NOT NETCDF_FOUND)
+@@ -50,18 +50,20 @@ if (UNIX AND NOT NETCDF_FOUND)
+ ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
+ OUTPUT_VARIABLE NETCDF_CONFIG_CFLAGS)
+ if (NETCDF_CONFIG_CFLAGS)
+- string (REGEX MATCHALL "-I[^ ]+" _netcdf_dashI
${NETCDF_CONFIG_CFLAGS})
+- string (REGEX REPLACE "-I" "" _netcdf_includepath
"${_netcdf_dashI}")
+- string (REGEX REPLACE "-I[^ ]+" "" _netcdf_cflags_other
${NETCDF_CONFIG_CFLAGS})
++ string (REGEX MATCHALL "(^| )-I[^ ]+" _netcdf_dashI
${NETCDF_CONFIG_CFLAGS})
++ string (REGEX REPLACE "(^| )-I" "" _netcdf_includepath
"${_netcdf_dashI}")
++ string (REGEX REPLACE "(^| )-I[^ ]+" ""
_netcdf_cflags_other ${NETCDF_CONFIG_CFLAGS})
+ endif (NETCDF_CONFIG_CFLAGS)
+ execute_process (COMMAND ${NETCDF_CONFIG} --libs
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
OUTPUT_VARIABLE NETCDF_CONFIG_LIBS)
if (NETCDF_CONFIG_LIBS)
- string (REGEX MATCHALL "-l[^ ]+" _netcdf_dashl
${NETCDF_CONFIG_LIBS})
- string (REGEX REPLACE "-l" "" _netcdf_lib
"${_netcdf_dashl}")
+- string (REGEX MATCHALL "-L[^ ]+" _netcdf_dashL
${NETCDF_CONFIG_LIBS})
+- string (REGEX REPLACE "-L" "" _netcdf_libpath
"${_netcdf_dashL}")
+ # Ensure -l is precedeced by whitespace to not match
+ # '-l' in '-L/usr/lib/x86_64-linux-gnu/hdf5/serial'
+ string (REGEX MATCHALL "(^| )-l[^ ]+" _netcdf_dashl
${NETCDF_CONFIG_LIBS})
+ string (REGEX REPLACE "(^| )-l" "" _netcdf_lib
"${_netcdf_dashl}")
- string (REGEX MATCHALL "-L[^ ]+" _netcdf_dashL
${NETCDF_CONFIG_LIBS})
- string (REGEX REPLACE "-L" "" _netcdf_libpath
"${_netcdf_dashL}")
++ string (REGEX MATCHALL "(^| )-L[^ ]+" _netcdf_dashL
${NETCDF_CONFIG_LIBS})
++ string (REGEX REPLACE "(^| )-L" "" _netcdf_libpath
"${_netcdf_dashL}")
endif (NETCDF_CONFIG_LIBS)
+ endif (NETCDF_CONFIG)
+ if (_netcdf_lib)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/gmt.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
