From 29535611d1ac116a34ca8036714f5cc1b94ab354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 11 Aug 2019 07:05:18 +0200 Subject: New upstream release: Refresh patches; New d/p/0040-remove_git.patch; refresh symbols file --- debian/patches/0700-mk_reproducible_results.patch | 120 +++++++++++++--------- 1 file changed, 69 insertions(+), 51 deletions(-) (limited to 'debian/patches/0700-mk_reproducible_results.patch') diff --git a/debian/patches/0700-mk_reproducible_results.patch b/debian/patches/0700-mk_reproducible_results.patch index defc409..044e60f 100644 --- a/debian/patches/0700-mk_reproducible_results.patch +++ b/debian/patches/0700-mk_reproducible_results.patch @@ -1,6 +1,6 @@ Description: Make build reproducible. Author: Jörg Frings-Fürst -Last-Update: 2015-05-21 +Last-Update: 2019-08-11 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/tools/sane-desc.c @@ -9,7 +9,7 @@ Index: trunk/tools/sane-desc.c +++ trunk/tools/sane-desc.c @@ -2816,8 +2816,10 @@ html_print_footer (void) "
\n" - "Contact\n" "
\n" "\n"); - printf ("This page was last updated on %s by sane-desc %s from %s\n", - asctime (localtime (¤t_time)), SANE_DESC_VERSION, PACKAGE_STRING); @@ -20,6 +20,17 @@ Index: trunk/tools/sane-desc.c printf ("\n"); printf (" \n"); } +@@ -3463,8 +3465,8 @@ print_udev_header (void) + { + time_t current_time = time (0); + printf ("# This file was automatically created based on description files (*.desc)\n" +- "# by sane-desc %s from %s on %s", +- SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (¤t_time))); ++ "# by sane-desc %s from %s\n", ++ SANE_DESC_VERSION, PACKAGE_STRING); + + printf + ("#\n" @@ -3656,8 +3658,8 @@ print_udevhwdb_header (void) { time_t current_time = time (0); @@ -31,50 +42,6 @@ Index: trunk/tools/sane-desc.c printf ("#\n" -Index: trunk/Makefile.in -=================================================================== ---- trunk.orig/Makefile.in -+++ trunk/Makefile.in -@@ -254,7 +254,7 @@ DLLTOOL = @DLLTOOL@ - DL_LIBS = @DL_LIBS@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ --DVIPS = @DVIPS@ -+DVIPS = @DVIPS@ -N - DYNAMIC_FLAG = @DYNAMIC_FLAG@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -276,7 +276,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - JPEG_LIBS = @JPEG_LIBS@ --LATEX = @LATEX@ -+LATEX = @LATEX@ --output-comment="" - LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ -Index: trunk/doc/Makefile.in -=================================================================== ---- trunk.orig/doc/Makefile.in -+++ trunk/doc/Makefile.in -@@ -190,7 +190,7 @@ DLLTOOL = @DLLTOOL@ - DL_LIBS = @DL_LIBS@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ --DVIPS = @DVIPS@ -+DVIPS = @DVIPS@ -N - DYNAMIC_FLAG = @DYNAMIC_FLAG@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -212,7 +212,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - JPEG_LIBS = @JPEG_LIBS@ --LATEX = TEXINPUTS="$(srcdir):$$TEXINPUTS" @LATEX@ -+LATEX = TEXINPUTS="$(srcdir):$$TEXINPUTS" @LATEX@ --output-comment="" - LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ Index: trunk/testsuite/tools/data/html-backends-split.ref =================================================================== --- trunk.orig/testsuite/tools/data/html-backends-split.ref @@ -85,7 +52,7 @@ Index: trunk/testsuite/tools/data/html-backends-split.ref -This page was last updated on Wed Jul 31 07:52:48 2013 - by sane-desc 3.5 from sane-backends 1.0.24git -+This page was last updated by sane-desc 3.5 from sane-backends 1.0.25 ++This page was last updated by sane-desc 3.5 from sane-backends 1.0.28-debian Index: trunk/testsuite/tools/data/html-mfgs.ref @@ -98,7 +65,7 @@ Index: trunk/testsuite/tools/data/html-mfgs.ref -This page was last updated on Wed Jul 31 07:52:48 2013 - by sane-desc 3.5 from sane-backends 1.0.24git -+This page was last updated by sane-desc 3.5 from sane-backends 1.0.25 ++This page was last updated by sane-desc 3.5 from sane-backends 1.0.28-debian Index: trunk/testsuite/tools/data/udev.ref @@ -108,7 +75,7 @@ Index: trunk/testsuite/tools/data/udev.ref @@ -1,5 +1,5 @@ # This file was automatically created based on description files (*.desc) -# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:48 2013 -+# by sane-desc 3.5 from sane-backends 1.0.25 ++# by sane-desc 3.5 from sane-backends 1.0.28-debian # # udev rules file for supported USB and SCSI devices # @@ -119,7 +86,7 @@ Index: trunk/testsuite/tools/data/udev+acl.ref @@ -1,5 +1,5 @@ # This file was automatically created based on description files (*.desc) -# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:49 2013 -+# by sane-desc 3.5 from sane-backends 1.0.25 ++# by sane-desc 3.5 from sane-backends 1.0.28-debian # # udev rules file for supported USB and SCSI devices # @@ -130,7 +97,58 @@ Index: trunk/testsuite/tools/data/udev+hwdb.ref @@ -1,5 +1,5 @@ # This file was automatically created based on description files (*.desc) -# by sane-desc 3.5 from sane-backends 1.0.24git on Thu Aug 1 18:50:15 2013 -+# by sane-desc 3.5 from sane-backends 1.0.25 ++# by sane-desc 3.5 from sane-backends 1.0.28-debian # # udev rules file for supported USB and SCSI devices # +Index: trunk/doc/Makefile.am +=================================================================== +--- trunk.orig/doc/Makefile.am ++++ trunk/doc/Makefile.am +@@ -278,11 +278,11 @@ sane.ind: $(API_SPEC_INPUTS) + + sane.dvi: $(API_SPEC_INPUTS) $(API_SPEC_EPS_FIGS) sane.ind + @echo Generating $@ from $<... +- @$(am_TEXINPUTS) $(LATEX) $< /dev/null ++ @$(am_TEXINPUTS) $(LATEX) --output-comment="" $< /dev/null + + sane.ps: sane.dvi + @echo Generating $@ from $<... +- @$(am_TEXINPUTS) $(DVIPS) -q $< -o $@ ++ @$(am_TEXINPUTS) $(DVIPS) -q -N $< -o $@ + + .fig.pdf: + @test -d $(@D) || $(MKDIR_P) $(@D) +Index: trunk/testsuite/tools/data/db.ref +=================================================================== +--- trunk.orig/testsuite/tools/data/db.ref ++++ trunk/testsuite/tools/data/db.ref +@@ -1,5 +1,5 @@ + # This file was automatically created based on description files (*.desc) +-# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:48 2013 ++# by sane-desc 3.5 from sane-backends 1.0.28-debian + # + # The entries below are used to detect a USB device when it's plugged in + # and then run a script to change the ownership and +Index: trunk/testsuite/tools/data/hwdb.ref +=================================================================== +--- trunk.orig/testsuite/tools/data/hwdb.ref ++++ trunk/testsuite/tools/data/hwdb.ref +@@ -1,5 +1,5 @@ + # This file was automatically created based on description files (*.desc) +-# by sane-desc 3.5 from sane-backends 1.0.25git on Tue Dec 3 15:24:46 2013 ++# by sane-desc 3.5 from sane-backends 1.0.28-debian + # + # hwdb file for supported USB devices + # +Index: trunk/testsuite/tools/data/usermap.ref +=================================================================== +--- trunk.orig/testsuite/tools/data/usermap.ref ++++ trunk/testsuite/tools/data/usermap.ref +@@ -1,5 +1,5 @@ + # This file was automatically created based on description files (*.desc) +-# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:48 2013 ++# by sane-desc 3.5 from sane-backends 1.0.28-debian + # + # The entries below are used to detect a USB device and change owner + # and permissions on the "device node" used by libusb. -- cgit v1.2.3 From dc033b1280a1308dda5fb38de4ebc05ffd6ee48b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 2 Feb 2020 17:18:13 +0100 Subject: Refresh patches --- debian/patches/0700-mk_reproducible_results.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/patches/0700-mk_reproducible_results.patch') diff --git a/debian/patches/0700-mk_reproducible_results.patch b/debian/patches/0700-mk_reproducible_results.patch index 044e60f..1b61b49 100644 --- a/debian/patches/0700-mk_reproducible_results.patch +++ b/debian/patches/0700-mk_reproducible_results.patch @@ -105,7 +105,7 @@ Index: trunk/doc/Makefile.am =================================================================== --- trunk.orig/doc/Makefile.am +++ trunk/doc/Makefile.am -@@ -278,11 +278,11 @@ sane.ind: $(API_SPEC_INPUTS) +@@ -279,11 +279,11 @@ sane.ind: $(API_SPEC_INPUTS) sane.dvi: $(API_SPEC_INPUTS) $(API_SPEC_EPS_FIGS) sane.ind @echo Generating $@ from $<... -- cgit v1.2.3