[freefempp] 01/04: Correct build_date_from_SOURCE_DATE_EPOCH.patch
Dimitrios Eftaxiopoulos
eftaxiop-guest at moszumanska.debian.org
Tue May 3 21:13:57 UTC 2016
This is an automated email from the git hooks/post-receive script.
eftaxiop-guest pushed a commit to branch master
in repository freefempp.
commit 58223365352597e3de4467f45dd5e4890328d069
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Mon May 2 02:22:08 2016 +0300
Correct build_date_from_SOURCE_DATE_EPOCH.patch
---
.gitignore | 8 +++++---
configure.ac | 1 -
debian/patches/build_date_from_SOURCE_DATE_EPOCH.patch | 8 ++++++++
debian/source/options | 2 +-
download/arpack/Makefile | 2 +-
download/blas/Makefile | 2 +-
download/fftw/Makefile | 2 +-
download/umfpack/Makefile | 2 +-
examples++-chapt3/heatexTh.ps | 2 +-
examples++-chapt3/imuonde.ps | 2 +-
examples++-chapt3/rmuonde.ps | 2 +-
examples++-chapt3/tempmuonde.ps | 2 +-
src/fflib/strversionnumber.cpp | 4 ++--
13 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/.gitignore b/.gitignore
index e3cb9d1..37b2f8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,13 @@
+.pc/*
+aclocal.m4
config-version.h
config_LIB_INFO
configure.param
debian/results.txt
download/Makefile
-examples++-load/config.log
examples++-load/WHERE_LIBRARY-config
-src/fflib/strversionnumber.cpp
+examples++-load/config.log
+Makefile-for-Checkam
src/medit/compil.date
src/mpi/config.log
-src/mpi/ff-mpirun
\ No newline at end of file
+src/mpi/ff-mpirun
diff --git a/configure.ac b/configure.ac
index 9c11565..1366a40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -605,7 +605,6 @@ ff_prefix_dir="${prefix}/lib/ff++/$VERSION"
AC_MSG_CHECKING(prefix dir freefem++ )
AC_MSG_RESULT($ff_prefix_dir)
-FF_DATE=`date`
AC_DEFINE_UNQUOTED(VersionFreeFemDate,"$FF_DATE",FreeFem++ build date)
AC_DEFINE_UNQUOTED(FF_PREFIX_DIR,"${ff_prefix_dir}",FreeFem prefix dir)
AC_SUBST(ff_prefix_dir,$ff_prefix_dir)
diff --git a/debian/patches/build_date_from_SOURCE_DATE_EPOCH.patch b/debian/patches/build_date_from_SOURCE_DATE_EPOCH.patch
index 3b78d31..12ea09c 100644
--- a/debian/patches/build_date_from_SOURCE_DATE_EPOCH.patch
+++ b/debian/patches/build_date_from_SOURCE_DATE_EPOCH.patch
@@ -15,6 +15,14 @@ Get build date from SOURCE_DATE_EPOCH (if set), to make the build reproducible
# To allow anonymous CVS version to contain a "./configure" and
# Makefiles
+@@ -601,7 +605,6 @@
+ AC_MSG_CHECKING(prefix dir freefem++ )
+ AC_MSG_RESULT($ff_prefix_dir)
+
+-FF_DATE=`date`
+ AC_DEFINE_UNQUOTED(VersionFreeFemDate,"$FF_DATE",FreeFem++ build date)
+ AC_DEFINE_UNQUOTED(FF_PREFIX_DIR,"${ff_prefix_dir}",FreeFem prefix dir)
+ AC_SUBST(ff_prefix_dir,$ff_prefix_dir)
--- a/src/fflib/Makefile.am
+++ b/src/fflib/Makefile.am
@@ -64,5 +64,5 @@
diff --git a/debian/source/options b/debian/source/options
index b768dae..1db2f1c 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1 +1 @@
- extend-diff-ignore = "(^|/)(download/Makefile|download/arpack/Makefile|download/bin|download/blas/Makefile|download/fftw/Makefile|download/umfpack/Makefile|examples\+\+-3d/all.edp|examples\+\+-chapt3/freefem\+\+.pref|examples\+\+-eigen/freefem\+\+.pref|examples\+\+-load/WHERE_LIBRARY-download-new|examples\+\+/freefem\+\+.pref|src/fflib/strversionnumber.cpp|config-version.h|config_LIB_INFO|examples\+\+-3d/freefem\+\+.pref|examples\+\+-load/WHERE_LIBRARY-config|examples\+\+-load/config.lo [...]
\ No newline at end of file
+ extend-diff-ignore = "(^|/)(download/Makefile|download/arpack/Makefile|download/bin|download/blas/Makefile|download/fftw/Makefile|download/umfpack/Makefile|examples\+\+-3d/all.edp|examples\+\+-chapt3/freefem\+\+.pref|examples\+\+-eigen/freefem\+\+.pref|examples\+\+-load/WHERE_LIBRARY-download-new|examples\+\+/freefem\+\+.pref|src/fflib/strversionnumber.cpp|config-version.h|config_LIB_INFO|examples\+\+-3d/freefem\+\+.pref|examples\+\+-load/WHERE_LIBRARY-config|examples\+\+-load/config.lo [...]
diff --git a/download/arpack/Makefile b/download/arpack/Makefile
index a6c33da..f6cdad0 100644
--- a/download/arpack/Makefile
+++ b/download/arpack/Makefile
@@ -228,7 +228,7 @@ FCFLAGS = -g -O2 -fstack-protector-strong -fPIC
FFGLUTNAME =
FFGLUTPROG = ffglut
FFLAGS = -g -fstack-protector-strong -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
-FF_DATE = Mon Apr 25 01:48:58 EEST 2016
+FF_DATE = 2016-04-24
FF_HAVE_REGEX_H = 1
FF_LAPACKdir =
FF_MALLOC_H = 1
diff --git a/download/blas/Makefile b/download/blas/Makefile
index 2f6156a..ee8c4a7 100644
--- a/download/blas/Makefile
+++ b/download/blas/Makefile
@@ -485,7 +485,7 @@ FCFLAGS = -g -O2 -fstack-protector-strong -fPIC
FFGLUTNAME =
FFGLUTPROG = ffglut
FFLAGS = -g -fstack-protector-strong -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
-FF_DATE = Mon Apr 25 01:48:58 EEST 2016
+FF_DATE = 2016-04-24
FF_HAVE_REGEX_H = 1
FF_LAPACKdir =
FF_MALLOC_H = 1
diff --git a/download/fftw/Makefile b/download/fftw/Makefile
index d136029..9602cfd 100644
--- a/download/fftw/Makefile
+++ b/download/fftw/Makefile
@@ -179,7 +179,7 @@ FCFLAGS = -g -O2 -fstack-protector-strong -fPIC
FFGLUTNAME =
FFGLUTPROG = ffglut
FFLAGS = -g -fstack-protector-strong -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
-FF_DATE = Mon Apr 25 01:48:58 EEST 2016
+FF_DATE = 2016-04-24
FF_HAVE_REGEX_H = 1
FF_LAPACKdir =
FF_MALLOC_H = 1
diff --git a/download/umfpack/Makefile b/download/umfpack/Makefile
index 28aa035..549871a 100644
--- a/download/umfpack/Makefile
+++ b/download/umfpack/Makefile
@@ -199,7 +199,7 @@ FCFLAGS = -g -O2 -fstack-protector-strong -fPIC
FFGLUTNAME =
FFGLUTPROG = ffglut
FFLAGS = -g -fstack-protector-strong -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
-FF_DATE = Mon Apr 25 01:48:58 EEST 2016
+FF_DATE = 2016-04-24
FF_HAVE_REGEX_H = 1
FF_LAPACKdir =
FF_MALLOC_H = 1
diff --git a/examples++-chapt3/heatexTh.ps b/examples++-chapt3/heatexTh.ps
index 1596106..52f1e5c 100644
--- a/examples++-chapt3/heatexTh.ps
+++ b/examples++-chapt3/heatexTh.ps
@@ -1,7 +1,7 @@
%!PS-Adobe-2.0 EPSF-2.0
%%Creator: user
%%Title: FreeFem++
-%%CreationDate: Mon Apr 25 01:54:05 2016
+%%CreationDate: Mon May 2 01:55:23 2016
%%Pages: 1
%%BoundingBox: 0 0 596 421
%%EndComments
diff --git a/examples++-chapt3/imuonde.ps b/examples++-chapt3/imuonde.ps
index 8563146..33bb60f 100644
--- a/examples++-chapt3/imuonde.ps
+++ b/examples++-chapt3/imuonde.ps
@@ -1,7 +1,7 @@
%!PS-Adobe-2.0 EPSF-2.0
%%Creator: user
%%Title: FreeFem++
-%%CreationDate: Mon Apr 25 01:54:06 2016
+%%CreationDate: Mon May 2 01:55:24 2016
%%Pages: 1
%%BoundingBox: 0 0 596 421
%%EndComments
diff --git a/examples++-chapt3/rmuonde.ps b/examples++-chapt3/rmuonde.ps
index 410a60e..1381033 100644
--- a/examples++-chapt3/rmuonde.ps
+++ b/examples++-chapt3/rmuonde.ps
@@ -1,7 +1,7 @@
%!PS-Adobe-2.0 EPSF-2.0
%%Creator: user
%%Title: FreeFem++
-%%CreationDate: Mon Apr 25 01:54:06 2016
+%%CreationDate: Mon May 2 01:55:24 2016
%%Pages: 1
%%BoundingBox: 0 0 596 421
%%EndComments
diff --git a/examples++-chapt3/tempmuonde.ps b/examples++-chapt3/tempmuonde.ps
index 283977d..2ee4f4f 100644
--- a/examples++-chapt3/tempmuonde.ps
+++ b/examples++-chapt3/tempmuonde.ps
@@ -1,7 +1,7 @@
%!PS-Adobe-2.0 EPSF-2.0
%%Creator: user
%%Title: FreeFem++
-%%CreationDate: Mon Apr 25 01:54:06 2016
+%%CreationDate: Mon May 2 01:55:24 2016
%%Pages: 1
%%BoundingBox: 0 0 596 421
%%EndComments
diff --git a/src/fflib/strversionnumber.cpp b/src/fflib/strversionnumber.cpp
index b92252c..c31f221 100644
--- a/src/fflib/strversionnumber.cpp
+++ b/src/fflib/strversionnumber.cpp
@@ -18,6 +18,6 @@ string StrVersionNumber(){
// buffer.precision(8);
// buffer<<VersionNumber();
static char buffer[100];
- sprintf(buffer," %9f (date Mon Apr 25 01:48:58 EEST 2016)",VersionNumber());
- return buffer; //.str()+" (date Mon Apr 25 01:48:58 EEST 2016)" ;
+ sprintf(buffer," %9f (date 2016-04-24)",VersionNumber());
+ return buffer; //.str()+" (date 2016-04-24)" ;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freefempp.git
More information about the debian-science-commits
mailing list