diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2023-02-16 10:20:29 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2023-02-16 10:20:29 +0100 |
commit | 8459e0f4eedbc475004573b80587d989a23aafc9 (patch) | |
tree | a754e785b286ed82b45fe4e50b980714ad80e0a7 /debian/patches/0011-test.patch | |
parent | 484d47812c1b29a1d6aa9ce7915fa7600173281b (diff) | |
parent | 778ebf8ee9cb22ea5727844333bcd5a6ee6bc0de (diff) |
Merge tag 'debian/1.2.1-1' into develop
New Upstream release
Diffstat (limited to 'debian/patches/0011-test.patch')
-rw-r--r-- | debian/patches/0011-test.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/debian/patches/0011-test.patch b/debian/patches/0011-test.patch deleted file mode 100644 index d4d4590..0000000 --- a/debian/patches/0011-test.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: trunk/frontend/jpegtopdf.c -=================================================================== ---- trunk.orig/frontend/jpegtopdf.c -+++ trunk/frontend/jpegtopdf.c -@@ -184,6 +184,7 @@ static SANE_Int _get_current_time( struc - SANE_Int ret = SANE_ERR; - time_t t; - long tz; -+ long timezone = 0; - - if ( pt == NULL || sign_c == NULL || ptz_h == NULL || ptz_m == NULL ) { - goto EXIT; -@@ -201,7 +202,7 @@ static SANE_Int _get_current_time( struc - goto EXIT; - } - /* get time difference ( OHH'mm' ) */ -- tz = timezone; -+ tz = timezone; - if ( tz > 0 ) { - *sign_c = '-'; - } -Index: trunk/configure.ac -=================================================================== ---- trunk.orig/configure.ac -+++ trunk/configure.ac -@@ -671,7 +671,7 @@ ALL_BACKENDS="abaton agfafocus apple art - mustek_usb mustek_usb2 nec net niash pie pieusb pint \ - pixma plustek plustek_pp qcam ricoh ricoh2 rts8891 s9036 \ - sceptre sharp sm3600 sm3840 snapscan sp15c st400 \ -- stv680 tamarack teco1 teco2 teco3 test u12 umax -+ stv680 tamarack teco1 teco2 teco3 test u12 umax \ - umax_pp umax1220u v4l xerox_mfp p5" - - # If user specifies backends manually then cause configure |