This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository ossim.
commit 7864b15324a042a966e536e0d361ac187aae32c7
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Fri Jun 5 16:36:20 2015 +0200
Apply patches by Juan Picca to make the build reproducible.
Update BUILD_DATE command to also work with dpkg << 1.17.
---
debian/changelog | 3 +++
debian/patches/avoid_overwrite_build_date.patch | 19 +++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 3 +++
4 files changed, 26 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 2d8bacd..b1dbfb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ ossim (1.8.16-4) UNRELEASED; urgency=medium
(closes: #755188)
* Update description to clearify that MPI support is not enabled.
(closes: #755189)
+ * Apply patches by Juan Picca to make the build reproducible.
+ Update BUILD_DATE command to also work with dpkg << 1.17.
+ (closes: #787790)
-- Bas Couwenberg <sebas...@xs4all.nl> Sun, 02 Nov 2014 21:19:37 +0100
diff --git a/debian/patches/avoid_overwrite_build_date.patch
b/debian/patches/avoid_overwrite_build_date.patch
new file mode 100644
index 0000000..8b0c03a
--- /dev/null
+++ b/debian/patches/avoid_overwrite_build_date.patch
@@ -0,0 +1,19 @@
+Description: Avoid overwrite build date.
+ Previous to use the current date to set the variable OSSIM_BUILD_DATE check if
+ it was already defined in command line.
+Author: Juan Picca <jumap...@gmail.com>
+Last-Update: 2015-06-04
+---
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -148,7 +148,9 @@ endif ( ZLIB_FOUND )
+ #---
+ # Call the OSSIM macros in OssimUtilities.cmake
+ #---
+-TODAYS_DATE(OSSIM_BUILD_DATE)
++if ( NOT OSSIM_BUILD_DATE )
++ TODAYS_DATE(OSSIM_BUILD_DATE)
++endif()
+ SET(OSSIM_SVN_REVISION_NUMBER "UNKNOWN")
+ GET_SVN_REVISION()
+ if ( NOT ${Project_WC_REVISION} EQUAL 0 )
diff --git a/debian/patches/series b/debian/patches/series
index a3ea3e4..50ba1d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
cmake
+avoid_overwrite_build_date.patch
diff --git a/debian/rules b/debian/rules
index fce4923..e89bf19 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+BUILD_DATE=$(shell dpkg-parsechangelog | sed -n 's/^Date: //p' | LC_ALL=C date
-u "+%d %B %Y" -f -)
+
OSSIM_VERSION=$(shell dpkg-parsechangelog|grep Version:|cut -d' ' -f2|cut -d-
-f1)
OSSIM_VERSION_TAG=$(subst .,_,$(OSSIM_VERSION))
@@ -21,6 +23,7 @@ endif
# Add here any variable or target overrides you need.
CMAKE_OPTS = \
-DCMAKE_INSTALL_PREFIX=/usr \
+ -DOSSIM_BUILD_DATE=$(BUILD_DATE) \
-DBUILD_OSSIM_FRAMEWORKS=ON \
-DBUILD_OSSIM_FREETYPE_SUPPORT=ON \
-DBUILD_OSSIM_ID_SUPPORT=ON \
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/ossim.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
