diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-09-10 19:11:27 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-09-10 19:11:27 +0200 |
| commit | 7e9455b3b15671ff99ed168638c405e2acedb6df (patch) | |
| tree | 444e59ece236e09dc153f665e42160aeb0208c24 /debian/patches/0145-avahi.patch | |
| parent | bc8a517abd2e11e1435f4ef042cfcc8648b62ef7 (diff) | |
| parent | bce41b3c37c2a68e7dab234ce0247755a61ceb40 (diff) | |
Merge branch 'release/debian/1.0.31-1_experimental1' into masterdebian/1.0.31-1_experimental1
Diffstat (limited to 'debian/patches/0145-avahi.patch')
| -rw-r--r-- | debian/patches/0145-avahi.patch | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/debian/patches/0145-avahi.patch b/debian/patches/0145-avahi.patch index 023dec5..67c874b 100644 --- a/debian/patches/0145-avahi.patch +++ b/debian/patches/0145-avahi.patch @@ -1,6 +1,7 @@ Description: scanimage assert failure: *** Error in `scanimage': double free or corruption (top) Author: Laurent Vivier Laurent@vivier.eu Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/sane-backends/+bug/1208091 +Forwarded: not needed Last-Update: 2017-06-20 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ @@ -12,21 +13,22 @@ Index: trunk/backend/net.c first_device = NULL; first_handle = NULL; --#ifdef WITH_AVAHI +-#if WITH_AVAHI - net_avahi_init (); -#endif /* WITH_AVAHI */ - auth_callback = authorize; /* Return the version number of the sane-backends package to allow -@@ -1119,6 +1115,10 @@ sane_init (SANE_Int * version_code, SANE +@@ -1119,6 +1115,11 @@ sane_init (SANE_Int * version_code, SANE DBG (2, "sane_init: connect timeout set to %d seconds from env\n", connect_timeout); } -+#ifdef WITH_AVAHI ++#if WITH_AVAHI + net_avahi_init (); +#endif /* WITH_AVAHI */ + ++ DBG (2, "sane_init: done\n"); return SANE_STATUS_GOOD; } |