This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository netcdf.
commit 99504bd8b0a61a3418c972f1c7dffe5695a208c4 Author: Bas Couwenberg <[email protected]> Date: Tue Jun 21 07:27:07 2016 +0200 Drop source_date_epoch.patch, applied upstream. --- debian/changelog | 1 + debian/patches/series | 1 - debian/patches/source_date_epoch.patch | 44 ---------------------------------- 3 files changed, 1 insertion(+), 45 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1fb81f2..1cc77b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ netcdf (1:4.4.1~rc3-1) UNRELEASED; urgency=medium * New upstream release candidate. + * Drop source_date_epoch.patch, applied upstream. -- Bas Couwenberg <[email protected]> Tue, 21 Jun 2016 07:11:01 +0200 diff --git a/debian/patches/series b/debian/patches/series index 638035f..bf960a3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,5 +2,4 @@ link-private.patch privacy-breach-logo.patch hdf5-library-path.patch tst_fileinfo-link-hdf5.patch -source_date_epoch.patch reproducible-settings.patch diff --git a/debian/patches/source_date_epoch.patch b/debian/patches/source_date_epoch.patch deleted file mode 100644 index 857a914..0000000 --- a/debian/patches/source_date_epoch.patch +++ /dev/null @@ -1,44 +0,0 @@ -Description: Use SOURCE_DATE_EPOCH instead of current date. -Author: Bas Couwenberg <[email protected]> -Forwarded: https://github.com/Unidata/netcdf-c/pull/263 -Applied-Upstream: https://github.com/Unidata/netcdf-c/commit/aa8f23c5bbed9892a65f27fb8854e649f4ed1c1f - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -124,10 +124,17 @@ STRING(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE - - # Determine the configure date. - --EXECUTE_PROCESS( -- COMMAND date -- OUTPUT_VARIABLE CONFIG_DATE -- ) -+IF(DEFINED ENV{SOURCE_DATE_EPOCH}) -+ EXECUTE_PROCESS( -+ COMMAND "date" "-u" "-d" "@$ENV{SOURCE_DATE_EPOCH}" -+ OUTPUT_VARIABLE CONFIG_DATE -+ ) -+ELSE() -+ EXECUTE_PROCESS( -+ COMMAND date -+ OUTPUT_VARIABLE CONFIG_DATE -+ ) -+ENDIF() - IF(CONFIG_DATE) - string(STRIP ${CONFIG_DATE} CONFIG_DATE) - ENDIF() ---- a/configure.ac -+++ b/configure.ac -@@ -45,7 +45,11 @@ AC_MSG_NOTICE([netCDF AC_PACKAGE_VERSION - AC_CONFIG_MACRO_DIR([m4]) - - # Configuration Date --AC_SUBST([CONFIG_DATE]) CONFIG_DATE="`date`" -+if test -n ${SOURCE_DATE_EPOCH}; then -+ AC_SUBST([CONFIG_DATE]) CONFIG_DATE="`date -u -d "@${SOURCE_DATE_EPOCH}"`" -+else -+ AC_SUBST([CONFIG_DATE]) CONFIG_DATE="`date`" -+fi - - # Find out about the host we're building on. - AC_CANONICAL_HOST -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
