diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/libsane1.symbols | 180 | ||||
| -rw-r--r-- | debian/patches/0040-remove_git.patch | 19 | ||||
| -rw-r--r-- | debian/patches/0700-mk_reproducible_results.patch | 120 | ||||
| -rw-r--r-- | debian/patches/0710-sane-desc.c_debian_mods.patch | 11 | ||||
| -rw-r--r-- | debian/patches/0715-20-sane.hwdb_multi-arch.patch | 85 | ||||
| -rw-r--r-- | debian/patches/0725-fix_link_60-libsane_rule.patch | 2 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
9 files changed, 105 insertions, 326 deletions
diff --git a/debian/changelog b/debian/changelog index d78c700..f68eb36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,13 @@ sane-backends (1.0.28-1~experimental1) experimental; urgency=medium * New upstream release. + - New debian/patches/0040-remove_git.patch to remove git access at build time. + - Refresh patches: + + debian/patches/0700-mk_reproducible_results.patch. + + debian/patches/0710-sane-desc.c_debian_mods.patch. + + debian/patches/0715-20-sane.hwdb_multi-arch.patch. + + debian/patches/0725-fix_link_60-libsane_rule.patch. + - Refresh symbols file. * debian/rules: - Add --exclude=/sane/ to override_dh_makeshlibs-arch to generate only public symbols (Closes: #911597). @@ -35,7 +42,7 @@ sane-backends (1.0.28-1~experimental1) experimental; urgency=medium - Change debian/compat to 12. - Bump minimum debhelper version in debian/control to >= 12. * Declare compliance with Debian Policy 4.4.0 (No changes needed). - * New debian/sane-utils.lintian-overrides to override false positve missing + * New debian/sane-utils.lintian-overrides to override false positive missing init.d script. * debian/control: Add Pre-Depends ${misc:Pre-Depends} to install invoke-rc.d. * debian/watch: Rewrite for the new Gitlab directory layout. diff --git a/debian/control b/debian/control index f0ac9b4..46242ce 100644 --- a/debian/control +++ b/debian/control @@ -5,9 +5,11 @@ Maintainer: Jörg Frings-Fürst <debian@jff.email> Standards-Version: 4.4.0 Build-Depends: autoconf, + autoconf-archive, chrpath, debhelper (>= 12), gettext, + git, libavahi-client-dev, libcam-dev [kfreebsd-any], libcups2-dev, diff --git a/debian/libsane1.symbols b/debian/libsane1.symbols index 0604286..19cb8b4 100644 --- a/debian/libsane1.symbols +++ b/debian/libsane1.symbols @@ -1,5 +1,4 @@ libsane.so.1 libsane1 #MINVER# - cmsg@Base 1.0.27 md5_buffer@Base 1.0.27 md5_finish_ctx@Base 1.0.27 md5_init_ctx@Base 1.0.27 @@ -35,19 +34,7 @@ libsane.so.1 libsane1 #MINVER# sane_set_io_mode@Base 1.0.27 sane_start@Base 1.0.27 sane_strstatus@Base 1.0.27 - sanei_ab306_close@Base 1.0.27 - sanei_ab306_cmd@Base 1.0.27 - sanei_ab306_exit@Base 1.0.27 - sanei_ab306_get_io_privilege@Base 1.0.27 - sanei_ab306_open@Base 1.0.27 - sanei_ab306_rdata@Base 1.0.27 - sanei_ab306_test_ready@Base 1.0.27 - sanei_access_init@Base 1.0.27 - sanei_access_lock@Base 1.0.27 - sanei_access_unlock@Base 1.0.27 sanei_check_value@Base 1.0.27 - sanei_codec_bin_init@Base 1.0.27 - sanei_config_attach_matching_devices@Base 1.0.27 sanei_config_get_paths@Base 1.0.27 sanei_config_get_string@Base 1.0.27 sanei_config_open@Base 1.0.27 @@ -57,173 +44,6 @@ libsane.so.1 libsane1 #MINVER# sanei_constrain_value@Base 1.0.27 sanei_debug_dll@Base 1.0.27 sanei_debug_msg@Base 1.0.27 - sanei_debug_sanei_ab306@Base 1.0.27 - sanei_debug_sanei_access@Base 1.0.27 sanei_debug_sanei_config@Base 1.0.27 sanei_debug_sanei_debug@Base 1.0.27 - sanei_debug_sanei_lm983x@Base 1.0.27 - sanei_debug_sanei_magic@Base 1.0.27 - sanei_debug_sanei_pa4s2@Base 1.0.27 - sanei_debug_sanei_pio@Base 1.0.27 - sanei_debug_sanei_pp@Base 1.0.27 - sanei_debug_sanei_pv8630@Base 1.0.27 - sanei_debug_sanei_scsi@Base 1.0.27 - sanei_debug_sanei_tcp@Base 1.0.27 - sanei_debug_sanei_thread@Base 1.0.27 - sanei_debug_sanei_udp@Base 1.0.27 - sanei_debug_sanei_usb@Base 1.0.27 - sanei_debug_sanei_wire@Base 1.0.27 sanei_init_debug@Base 1.0.27 - sanei_lm983x_init@Base 1.0.27 - sanei_lm983x_read@Base 1.0.27 - sanei_lm983x_reset@Base 1.0.27 - sanei_lm983x_write@Base 1.0.27 - sanei_lm983x_write_byte@Base 1.0.27 - sanei_magic_crop@Base 1.0.27 - sanei_magic_despeck@Base 1.0.27 - sanei_magic_findEdges@Base 1.0.27 - sanei_magic_findSkew@Base 1.0.27 - sanei_magic_findTurn@Base 1.0.27 - sanei_magic_getTransX@Base 1.0.27 - sanei_magic_getTransY@Base 1.0.27 - sanei_magic_init@Base 1.0.27 - sanei_magic_isBlank2@Base 1.0.27 - sanei_magic_isBlank@Base 1.0.27 - sanei_magic_rotate@Base 1.0.27 - sanei_magic_turn@Base 1.0.27 - sanei_pa4s2_close@Base 1.0.27 - sanei_pa4s2_devices@Base 1.0.27 - sanei_pa4s2_enable@Base 1.0.27 - sanei_pa4s2_open@Base 1.0.27 - sanei_pa4s2_options@Base 1.0.27 - sanei_pa4s2_readbegin@Base 1.0.27 - sanei_pa4s2_readbyte@Base 1.0.27 - sanei_pa4s2_readend@Base 1.0.27 - sanei_pa4s2_scsi_pp_get_status@Base 1.0.27 - sanei_pa4s2_scsi_pp_open@Base 1.0.27 - sanei_pa4s2_scsi_pp_reg_select@Base 1.0.27 - sanei_pa4s2_writebyte@Base 1.0.27 - sanei_pio_close@Base 1.0.27 - sanei_pio_open@Base 1.0.27 - sanei_pio_read@Base 1.0.27 - sanei_pio_write@Base 1.0.27 - sanei_pp_claim@Base 1.0.27 - sanei_pp_close@Base 1.0.27 - sanei_pp_getmodes@Base 1.0.27 - sanei_pp_inb_ctrl@Base 1.0.27 - sanei_pp_inb_data@Base 1.0.27 - sanei_pp_inb_epp@Base 1.0.27 - sanei_pp_inb_stat@Base 1.0.27 - sanei_pp_init@Base 1.0.27 - sanei_pp_open@Base 1.0.27 - sanei_pp_outb_addr@Base 1.0.27 - sanei_pp_outb_ctrl@Base 1.0.27 - sanei_pp_outb_data@Base 1.0.27 - sanei_pp_outb_epp@Base 1.0.27 - sanei_pp_release@Base 1.0.27 - sanei_pp_set_datadir@Base 1.0.27 - sanei_pp_setmode@Base 1.0.27 - sanei_pp_udelay@Base 1.0.27 - sanei_pp_uses_directio@Base 1.0.27 - sanei_pv8630_bulkread@Base 1.0.27 - sanei_pv8630_bulkwrite@Base 1.0.27 - sanei_pv8630_flush_buffer@Base 1.0.27 - sanei_pv8630_init@Base 1.0.27 - sanei_pv8630_prep_bulkread@Base 1.0.27 - sanei_pv8630_prep_bulkwrite@Base 1.0.27 - sanei_pv8630_read_byte@Base 1.0.27 - sanei_pv8630_wait_byte@Base 1.0.27 - sanei_pv8630_write_byte@Base 1.0.27 - sanei_pv8630_xpect_byte@Base 1.0.27 - sanei_scsi_close@Base 1.0.27 - sanei_scsi_cmd2@Base 1.0.27 - sanei_scsi_cmd@Base 1.0.27 - sanei_scsi_find_devices@Base 1.0.27 - sanei_scsi_max_request_size@Base 1.0.27 - sanei_scsi_open@Base 1.0.27 - sanei_scsi_open_extended@Base 1.0.27 - sanei_scsi_req_enter2@Base 1.0.27 - sanei_scsi_req_enter@Base 1.0.27 - sanei_scsi_req_flush_all@Base 1.0.27 - sanei_scsi_req_flush_all_extended@Base 1.0.27 - sanei_scsi_req_wait@Base 1.0.27 - sanei_tcp_close@Base 1.0.27 - sanei_tcp_open@Base 1.0.27 - sanei_tcp_read@Base 1.0.27 - sanei_tcp_write@Base 1.0.27 - sanei_thread_begin@Base 1.0.27 - sanei_thread_get_status@Base 1.0.27 - sanei_thread_init@Base 1.0.27 - sanei_thread_is_forked@Base 1.0.27 - sanei_thread_is_valid@Base 1.0.27 - sanei_thread_kill@Base 1.0.27 - sanei_thread_sendsig@Base 1.0.27 - sanei_thread_waitpid@Base 1.0.27 - sanei_udp_close@Base 1.0.27 - sanei_udp_open@Base 1.0.27 - sanei_udp_open_broadcast@Base 1.0.27 - sanei_udp_read@Base 1.0.27 - sanei_udp_recvfrom@Base 1.0.27 - sanei_udp_set_nonblock@Base 1.0.27 - sanei_udp_write@Base 1.0.27 - sanei_udp_write_broadcast@Base 1.0.27 - sanei_usb_attach_matching_devices@Base 1.0.27 - sanei_usb_claim_interface@Base 1.0.27 - sanei_usb_clear_halt@Base 1.0.27 - sanei_usb_close@Base 1.0.27 - sanei_usb_control_msg@Base 1.0.27 - sanei_usb_exit@Base 1.0.27 - sanei_usb_find_devices@Base 1.0.27 - sanei_usb_get_descriptor@Base 1.0.27 - sanei_usb_get_endpoint@Base 1.0.27 - sanei_usb_get_vendor_product@Base 1.0.27 - sanei_usb_get_vendor_product_byname@Base 1.0.27 - sanei_usb_init@Base 1.0.27 - sanei_usb_open@Base 1.0.27 - sanei_usb_read_bulk@Base 1.0.27 - sanei_usb_read_int@Base 1.0.27 - sanei_usb_release_interface@Base 1.0.27 - sanei_usb_reset@Base 1.0.27 - sanei_usb_scan_devices@Base 1.0.27 - sanei_usb_set_altinterface@Base 1.0.27 - sanei_usb_set_configuration@Base 1.0.27 - sanei_usb_set_endpoint@Base 1.0.27 - sanei_usb_set_timeout@Base 1.0.27 - sanei_usb_write_bulk@Base 1.0.27 - sanei_w_action@Base 1.0.27 - sanei_w_array@Base 1.0.27 - sanei_w_authorization_req@Base 1.0.27 - sanei_w_bool@Base 1.0.27 - sanei_w_byte@Base 1.0.27 - sanei_w_call@Base 1.0.27 - sanei_w_char@Base 1.0.27 - sanei_w_constraint_type@Base 1.0.27 - sanei_w_control_option_reply@Base 1.0.27 - sanei_w_control_option_req@Base 1.0.27 - sanei_w_device@Base 1.0.27 - sanei_w_device_ptr@Base 1.0.27 - sanei_w_exit@Base 1.0.27 - sanei_w_frame@Base 1.0.27 - sanei_w_free@Base 1.0.27 - sanei_w_get_devices_reply@Base 1.0.27 - sanei_w_get_parameters_reply@Base 1.0.27 - sanei_w_init@Base 1.0.27 - sanei_w_init_reply@Base 1.0.27 - sanei_w_init_req@Base 1.0.27 - sanei_w_open_reply@Base 1.0.27 - sanei_w_option_descriptor@Base 1.0.27 - sanei_w_option_descriptor_array@Base 1.0.27 - sanei_w_option_descriptor_ptr@Base 1.0.27 - sanei_w_parameters@Base 1.0.27 - sanei_w_ptr@Base 1.0.27 - sanei_w_range@Base 1.0.27 - sanei_w_reply@Base 1.0.27 - sanei_w_set_dir@Base 1.0.27 - sanei_w_space@Base 1.0.27 - sanei_w_start_reply@Base 1.0.27 - sanei_w_status@Base 1.0.27 - sanei_w_string@Base 1.0.27 - sanei_w_unit@Base 1.0.27 - sanei_w_value_type@Base 1.0.27 - sanei_w_void@Base 1.0.27 - sanei_w_word@Base 1.0.27 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 (¤t_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 (¤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 <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 (¤t_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 |