[Pkg-ocaml-maint-commits] [advi] 02/02: drop build-date

Ralf Treinen treinen at moszumanska.debian.org
Wed Aug 24 07:42:38 UTC 2016


This is an automated email from the git hooks/post-receive script.

treinen pushed a commit to branch master
in repository advi.

commit 92389f3fb1b2160a852e6968b8f70a6ea9fca1d2
Author: Ralf Treinen <treinen at free.fr>
Date:   Wed Aug 24 09:41:17 2016 +0200

    drop build-date
---
 debian/changelog               |   3 +-
 debian/patches/drop-build-date | 193 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |   1 +
 3 files changed, 196 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 08929b9..dc5cf59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ advi (1.10.2-3) UNRELEASED; urgency=low
     more than 10 years old.
   * advi: don't create empty directory usr/share/lintian/overrides/
   * d/control: fix Vcs-* fields
+  * patch drop-build-date: make build reproducible (closes: #834137)
 
- -- Ralf Treinen <treinen at debian.org>  Fri, 19 Jun 2015 08:33:17 +0200
+ -- Ralf Treinen <treinen at debian.org>  Tue, 16 Aug 2016 20:42:32 +0200
 
 advi (1.10.2-2) unstable; urgency=low
 
diff --git a/debian/patches/drop-build-date b/debian/patches/drop-build-date
new file mode 100644
index 0000000..6db10e5
--- /dev/null
+++ b/debian/patches/drop-build-date
@@ -0,0 +1,193 @@
+Author: Ralf Treinen <treinen at debian.org>
+Description: drop build-date to make build reprodicible
+Debian-bug: #834137
+
+Index: advi/src/main.ml
+===================================================================
+--- advi.orig/src/main.ml	2016-08-16 21:11:55.400324011 +0200
++++ advi/src/main.ml	2016-08-16 21:11:55.396323990 +0200
+@@ -41,20 +41,10 @@
+       Config.advi_version_number);
+   exit 0;;
+ 
+-let print_advi_full_version () =
+-  prerr_endline
+-   (Printf.sprintf
+-      "The Active-DVI previewer and graphics presenter, version %s"
+-      Config.advi_full_version);
+-  exit 0;;
+-
+ let version_spec = function
+   | "-v" as opt ->
+        opt, Arg.Unit print_advi_version,
+-       "  print the Active-DVI version."
+-  | opt ->
+-       opt, Arg.Unit print_advi_full_version,
+-       "  print the full Active-DVI version, sub-version and release date.";;
++       "  print the Active-DVI version.";;
+ 
+ let spec_list = [
+   ("-geometry", Arg.String set_geom,
+@@ -79,7 +69,6 @@
+    "<dimen>  set the vertical margin\
+    \n\t (the default is 1cm).");
+   version_spec "-v";
+-  version_spec "--version";
+   ] in
+ 
+ List.iter (fun (nm, act, man) -> Options.add nm act man) spec_list;;
+Index: advi/src/config.ml.in
+===================================================================
+--- advi.orig/src/config.ml.in	2016-08-16 21:11:55.400324011 +0200
++++ advi/src/config.ml.in	2016-08-16 21:11:55.400324011 +0200
+@@ -19,11 +19,6 @@
+ 
+ (* The current version of Active-DVI *)
+ let advi_version_number = "@PACKAGE_VERSION@";;
+-let advi_build_date = "@BUILD_DATE@";;
+-
+-let advi_full_version =
+-  Printf.sprintf "%s (build %s)"
+-    advi_version_number advi_build_date;;
+ 
+ (* Can we use gs ? *)
+ let have_gs = @HAVE_GS@;;
+Index: advi/configure
+===================================================================
+--- advi.orig/configure	2016-08-16 21:11:55.400324011 +0200
++++ advi/configure	2016-08-16 21:11:55.400324011 +0200
+@@ -699,8 +699,6 @@
+ INSTALL_DATA
+ INSTALL_SCRIPT
+ INSTALL_PROGRAM
+-BUILD_YEAR
+-BUILD_DATE
+ target_alias
+ host_alias
+ build_alias
+@@ -2191,9 +2189,6 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+-BUILD_DATE=`date +%Y-%m-%d`
+-BUILD_YEAR=`date +%Y`
+-
+ 
+ am__api_version='1.11'
+ 
+Index: advi/configure.ac
+===================================================================
+--- advi.orig/configure.ac	2016-08-16 21:11:55.400324011 +0200
++++ advi/configure.ac	2016-08-16 21:11:55.400324011 +0200
+@@ -1,10 +1,6 @@
+ ?i# Process this file with autoconf to produce a configure script.
+ AC_PREREQ(2.59)
+ AC_INIT(advi, 1.10.2, Didier.Remy at inria.fr)
+-BUILD_DATE=`date +%Y-%m-%d`
+-BUILD_YEAR=`date +%Y`
+-AC_SUBST(BUILD_DATE)
+-AC_SUBST(BUILD_YEAR)
+ AM_INIT_AUTOMAKE([foreign])
+ AM_MAINTAINER_MODE
+ 
+Index: advi/Makefile.in
+===================================================================
+--- advi.orig/Makefile.in	2016-08-16 21:11:55.400324011 +0200
++++ advi/Makefile.in	2016-08-16 21:11:55.400324011 +0200
+@@ -103,8 +103,6 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_DATE = @BUILD_DATE@
+-BUILD_YEAR = @BUILD_YEAR@
+ CAMLIMAGES_CCLIBS = @CAMLIMAGES_CCLIBS@
+ CAMLIMAGES_INCLUDES = @CAMLIMAGES_INCLUDES@
+ CAMLIMAGES_LIBS_BYTE = @CAMLIMAGES_LIBS_BYTE@
+Index: advi/doc/Makefile.in
+===================================================================
+--- advi.orig/doc/Makefile.in	2016-08-16 21:11:55.400324011 +0200
++++ advi/doc/Makefile.in	2016-08-16 21:11:55.400324011 +0200
+@@ -136,8 +136,6 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_DATE = @BUILD_DATE@
+-BUILD_YEAR = @BUILD_YEAR@
+ CAMLIMAGES_CCLIBS = @CAMLIMAGES_CCLIBS@
+ CAMLIMAGES_INCLUDES = @CAMLIMAGES_INCLUDES@
+ CAMLIMAGES_LIBS_BYTE = @CAMLIMAGES_LIBS_BYTE@
+@@ -890,13 +888,13 @@
+ .htm.html: 
+ 	sed \
+ 	 -e 's, at VERSION\@,$(VERSION),' \
+-	 -e 's, at COPYRIGHT\@,$(BUILD_YEAR),' \
++#	 -e 's, at COPYRIGHT\@,$(BUILD_YEAR),' \
+ 	 $< > $@ 
+ 
+ .man.1: $(top_srcdir)/config.status
+ 	sed \
+ 	 -e 's, at VERSION\@,$(VERSION),' \
+-	 -e 's, at COPYRIGHT\@,$(BUILD_YEAR),' \
++#	 -e 's, at COPYRIGHT\@,$(BUILD_YEAR),' \
+ 	 $< > $@ 
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+Index: advi/src/Makefile.in
+===================================================================
+--- advi.orig/src/Makefile.in	2016-08-16 21:11:55.400324011 +0200
++++ advi/src/Makefile.in	2016-08-16 21:11:55.400324011 +0200
+@@ -122,8 +122,6 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_DATE = @BUILD_DATE@
+-BUILD_YEAR = @BUILD_YEAR@
+ CAMLIMAGES_CCLIBS = @CAMLIMAGES_CCLIBS@
+ CAMLIMAGES_INCLUDES = @CAMLIMAGES_INCLUDES@
+ CAMLIMAGES_LIBS_BYTE = @CAMLIMAGES_LIBS_BYTE@
+@@ -645,7 +643,6 @@
+ 	rm -f $@ $@.tmp
+ 	sed \
+ 		-e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+-		-e 's, at BUILD_DATE\@,$(BUILD_DATE),g' \
+ 		-e 's, at HAVE_GS\@,$(HAVE_GS),g' \
+ 		-e 's, at HAVE_CAMLIMAGES\@,$(HAVE_CAMLIMAGES),g' \
+ 		-e 's, at TEXMFMAIN\@,$(TEXMFMAIN),g' \
+Index: advi/src/Makefile.am
+===================================================================
+--- advi.orig/src/Makefile.am	2016-08-16 21:11:55.400324011 +0200
++++ advi/src/Makefile.am	2016-08-16 21:11:55.400324011 +0200
+@@ -122,7 +122,6 @@
+ 	rm -f $@ $@.tmp
+ 	sed \
+ 		-e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+-		-e 's, at BUILD_DATE\@,$(BUILD_DATE),g' \
+ 		-e 's, at HAVE_GS\@,$(HAVE_GS),g' \
+ 		-e 's, at HAVE_CAMLIMAGES\@,$(HAVE_CAMLIMAGES),g' \
+ 		-e 's, at TEXMFMAIN\@,$(TEXMFMAIN),g' \
+Index: advi/tex/Makefile.in
+===================================================================
+--- advi.orig/tex/Makefile.in	2016-08-16 21:11:55.400324011 +0200
++++ advi/tex/Makefile.in	2016-08-16 21:11:55.400324011 +0200
+@@ -93,8 +93,6 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_DATE = @BUILD_DATE@
+-BUILD_YEAR = @BUILD_YEAR@
+ CAMLIMAGES_CCLIBS = @CAMLIMAGES_CCLIBS@
+ CAMLIMAGES_INCLUDES = @CAMLIMAGES_INCLUDES@
+ CAMLIMAGES_LIBS_BYTE = @CAMLIMAGES_LIBS_BYTE@
+Index: advi/doc/pngs/Makefile.in
+===================================================================
+--- advi.orig/doc/pngs/Makefile.in	2016-08-16 21:11:38.960233343 +0200
++++ advi/doc/pngs/Makefile.in	2016-08-16 21:12:23.384478197 +0200
+@@ -95,8 +95,6 @@
+ AWK = @AWK@
+ BUILD_DATE = @BUILD_DATE@
+ BUILD_YEAR = @BUILD_YEAR@
+-CAMLIMAGES_CCLIBS = @CAMLIMAGES_CCLIBS@
+-CAMLIMAGES_INCLUDES = @CAMLIMAGES_INCLUDES@
+ CAMLIMAGES_LIBS_BYTE = @CAMLIMAGES_LIBS_BYTE@
+ CAMLIMAGES_LIBS_NATIVE = @CAMLIMAGES_LIBS_NATIVE@
+ CAMLIMAGES_LPATH = @CAMLIMAGES_LPATH@
diff --git a/debian/patches/series b/debian/patches/series
index 8ddd890..2d3aa89 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ examples-distclean
 examples-makefiles
 examples-scripts
 really-clean
+drop-build-date

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/advi.git



More information about the Pkg-ocaml-maint-commits mailing list