summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/0040-remove_git.patch19
-rw-r--r--debian/patches/0700-mk_reproducible_results.patch120
-rw-r--r--debian/patches/0710-sane-desc.c_debian_mods.patch11
-rw-r--r--debian/patches/0715-20-sane.hwdb_multi-arch.patch85
-rw-r--r--debian/patches/0725-fix_link_60-libsane_rule.patch2
-rw-r--r--debian/patches/series3
6 files changed, 95 insertions, 145 deletions
diff --git a/debian/patches/0040-remove_git.patch b/debian/patches/0040-remove_git.patch
new file mode 100644
index 0000000..b45e898
--- /dev/null
+++ b/debian/patches/0040-remove_git.patch
@@ -0,0 +1,19 @@
+Description: Remove git from buildsystem
+Author: Jörg Frings-Fürst <debian@jff.email>
+Forwarded: not-needed
+Last-Update: 2019-08-11
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/configure.ac
+===================================================================
+--- trunk.orig/configure.ac
++++ trunk/configure.ac
+@@ -5,7 +5,7 @@ dnl Set up autoconf and automake
+ dnl When preparing a release, modify the numeric version components
+ dnl and remove the git suffix.
+ dnl ******************************************************************
+-AC_INIT([sane-backends],m4_esyscmd_s([git describe --dirty]),
++AC_INIT([sane-backends],[1.0.28-debian],
+ [sane-devel@alioth-lists.debian.net])
+ AC_PREREQ([2.69]) dnl minimum autoconf version required
+ AC_CONFIG_MACRO_DIR([m4])
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 <debian@jff-webhosting.net>
-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)
"<address>\n"
- "<a href=\"http://www.sane-project.org/imprint.html\"\n"
+ "<a href=\"imprint.html\"\n"
">Contact</a>\n" "</address>\n" "<font size=-1>\n");
- printf ("This page was last updated on %s by sane-desc %s from %s\n",
- asctime (localtime (&current_time)), SANE_DESC_VERSION, PACKAGE_STRING);
@@ -20,6 +20,17 @@ Index: trunk/tools/sane-desc.c
printf ("</font>\n");
printf ("</body> </html>\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 (&current_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
<font size=-1>
-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
</font>
</body> </html>
Index: trunk/testsuite/tools/data/html-mfgs.ref
@@ -98,7 +65,7 @@ Index: trunk/testsuite/tools/data/html-mfgs.ref
<font size=-1>
-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
</font>
</body> </html>
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 >/dev/null
++ @$(am_TEXINPUTS) $(LATEX) --output-comment="" $< </dev/null >/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.
diff --git a/debian/patches/0710-sane-desc.c_debian_mods.patch b/debian/patches/0710-sane-desc.c_debian_mods.patch
index 0207bbe..5dc9fdd 100644
--- a/debian/patches/0710-sane-desc.c_debian_mods.patch
+++ b/debian/patches/0710-sane-desc.c_debian_mods.patch
@@ -42,17 +42,6 @@ Index: trunk/tools/sane-desc.c
else
printf ("<td align=center>?</td>\n");
-@@ -2785,8 +2785,8 @@ html_print_header (void)
- printf
- ("</head>\n"
- "<body bgcolor=FFFFFF>\n"
-- "<div align=center>\n"
-- "<img src=\"http://www.sane-project.org/images/sane.png\" alt=\"SANE\">\n");
-+ "<div align=center>\n");
-+ /* "<img src=\"http://www.sane-project.org/images/sane.png\" alt=\"SANE\">\n"); */
- printf ("<h1>%s</h1>\n", title);
- printf ("</div>\n" "<hr>\n");
- printf ("%s\n", intro);
@@ -3463,8 +3463,8 @@ print_udev_header (void)
{
time_t current_time = time (0);
diff --git a/debian/patches/0715-20-sane.hwdb_multi-arch.patch b/debian/patches/0715-20-sane.hwdb_multi-arch.patch
index 350c911..e590649 100644
--- a/debian/patches/0715-20-sane.hwdb_multi-arch.patch
+++ b/debian/patches/0715-20-sane.hwdb_multi-arch.patch
@@ -2,14 +2,14 @@ Description: Make 20-sane.hwdb Multi-Arch ready
Author: Jörg Frings-Fürst <debian@jff.email>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=880391
Forwarded: not-needed
-Last-Update: 2018-04-02
+Last-Update: 2018-08-11
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: trunk/tools/sane-desc.c
===================================================================
--- trunk.orig/tools/sane-desc.c
+++ trunk/tools/sane-desc.c
-@@ -3326,10 +3326,10 @@ print_usermap_header (void)
+@@ -3328,10 +3328,10 @@ print_usermap_header (void)
printf
("# This file was automatically created based on description files (*.desc)\n"
@@ -22,7 +22,7 @@ Index: trunk/tools/sane-desc.c
printf
("# The entries below are used to detect a USB device and change owner\n"
-@@ -3398,8 +3398,8 @@ print_db_header (void)
+@@ -3400,8 +3400,8 @@ print_db_header (void)
{
time_t current_time = time (0);
printf ("# This file was automatically created based on description files (*.desc)\n"
@@ -33,7 +33,7 @@ Index: trunk/tools/sane-desc.c
printf
("#\n"
"# The entries below are used to detect a USB device when it's plugged in\n"
-@@ -3656,8 +3656,8 @@ print_udevhwdb_header (void)
+@@ -3768,8 +3768,8 @@ print_hwdb_header (void)
{
time_t current_time = time (0);
printf ("# This file was automatically created based on description files (*.desc)\n"
@@ -44,80 +44,3 @@ Index: trunk/tools/sane-desc.c
printf
("#\n"
-@@ -3766,8 +3766,8 @@ print_hwdb_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 (&current_time)));
-+ "# by sane-desc %s from %s\n",
-+ SANE_DESC_VERSION, PACKAGE_STRING);
-
- printf
- ("#\n"
-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.24git
- #
- # 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.25git
- #
- # hwdb file for supported USB devices
- #
-Index: trunk/testsuite/tools/data/udev+acl.ref
-===================================================================
---- trunk.orig/testsuite/tools/data/udev+acl.ref
-+++ 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.24git
- #
- # udev rules file for supported USB and SCSI devices
- #
-Index: trunk/testsuite/tools/data/udev+hwdb.ref
-===================================================================
---- trunk.orig/testsuite/tools/data/udev+hwdb.ref
-+++ 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.24git
- #
- # udev rules file for supported USB and SCSI devices
- #
-Index: trunk/testsuite/tools/data/udev.ref
-===================================================================
---- trunk.orig/testsuite/tools/data/udev.ref
-+++ 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.24git
- #
- # udev rules file for supported USB and SCSI 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.24git
- #
- # The entries below are used to detect a USB device and change owner
- # and permissions on the "device node" used by libusb.
diff --git a/debian/patches/0725-fix_link_60-libsane_rule.patch b/debian/patches/0725-fix_link_60-libsane_rule.patch
index dc99d2c..018e796 100644
--- a/debian/patches/0725-fix_link_60-libsane_rule.patch
+++ b/debian/patches/0725-fix_link_60-libsane_rule.patch
@@ -9,7 +9,7 @@ Index: trunk/tools/sane-desc.c
===================================================================
--- trunk.orig/tools/sane-desc.c
+++ trunk/tools/sane-desc.c
-@@ -3663,7 +3663,7 @@ print_udevhwdb_header (void)
+@@ -3665,7 +3665,7 @@ print_udevhwdb_header (void)
("#\n"
"# udev rules file for supported USB and SCSI devices\n"
"#\n"
diff --git a/debian/patches/series b/debian/patches/series
index 717fd31..cb9993e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,7 @@
##0020-nousbtest.patch
##0025-multiarch_manpages_libdir.patch
#0030-ppc64el.patch
+0040-remove_git.patch
0035-trim-libraries-in-sane-backends.pc.in.patch
#0100-source_spelling.patch
#0105-hp3900.patch
@@ -12,7 +13,7 @@
#0120-typo.patch
0600-scanimage_manpage.patch
#0605-man_typo.patch
-#0700-mk_reproducible_results.patch
+0700-mk_reproducible_results.patch
0705-kfreebsd.patch
##0710-sane-desc.c_debian_mods.patch
##0125-multiarch_dll_search_path.patch