summaryrefslogtreecommitdiff
path: root/debian/patches/0140-avahi.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/0140-avahi.patch')
-rw-r--r--debian/patches/0140-avahi.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches/0140-avahi.patch b/debian/patches/0140-avahi.patch
index b666bff..799b350 100644
--- a/debian/patches/0140-avahi.patch
+++ b/debian/patches/0140-avahi.patch
@@ -9,7 +9,7 @@ Index: trunk/backend/net.c
===================================================================
--- trunk.orig/backend/net.c
+++ trunk/backend/net.c
-@@ -769,7 +769,7 @@ net_avahi_browse_callback (AvahiServiceB
+@@ -798,7 +798,7 @@ net_avahi_browse_callback (AvahiServiceB
{
case AVAHI_BROWSER_FAILURE:
DBG (1, "net_avahi_browse_callback: %s\n", avahi_strerror (avahi_client_errno (avahi_service_browser_get_client (b))));
@@ -18,7 +18,7 @@ Index: trunk/backend/net.c
return;
case AVAHI_BROWSER_NEW:
-@@ -834,7 +834,7 @@ net_avahi_callback (AvahiClient *c, Avah
+@@ -863,7 +863,7 @@ net_avahi_callback (AvahiClient *c, Avah
if (avahi_browser == NULL)
{
DBG (1, "net_avahi_callback: could not create service browser: %s\n", avahi_strerror (avahi_client_errno (c)));
@@ -27,7 +27,7 @@ Index: trunk/backend/net.c
}
break;
-@@ -857,14 +857,14 @@ net_avahi_callback (AvahiClient *c, Avah
+@@ -886,14 +886,14 @@ net_avahi_callback (AvahiClient *c, Avah
if (avahi_client == NULL)
{
DBG (1, "net_avahi_init: could not create Avahi client: %s\n", avahi_strerror (error));
@@ -44,7 +44,7 @@ Index: trunk/backend/net.c
}
break;
}
-@@ -1043,12 +1043,12 @@ sane_init (SANE_Int * version_code, SANE
+@@ -1072,12 +1072,12 @@ sane_init (SANE_Int * version_code, SANE
continue;
}
#if WITH_AVAHI
@@ -59,7 +59,7 @@ Index: trunk/backend/net.c
#endif /* WITH_AVAHI */
}
-@@ -1094,12 +1094,12 @@ sane_init (SANE_Int * version_code, SANE
+@@ -1123,12 +1123,12 @@ sane_init (SANE_Int * version_code, SANE
continue;
#endif /* ENABLE_IPV6 */
#if WITH_AVAHI
@@ -74,7 +74,7 @@ Index: trunk/backend/net.c
#endif /* WITH_AVAHI */
}
free (copy);
-@@ -1517,11 +1517,11 @@ sane_open (SANE_String_Const full_name,
+@@ -1546,11 +1546,11 @@ sane_open (SANE_String_Const full_name,
"sane_open: device %s not found, trying to register it anyway\n",
nd_name);
#if WITH_AVAHI