Merge tag 'experimental/1.0.29-1_experimental1' into develop

New upstream release

1 files changed, 0 insertions, 33 deletions

diff --git a/debian/patches/0110-dll_backend_conf.patch b/debian/patches/0110-dll_backend_conf.patch
deleted file mode 100644
index 193d75b..0000000
--- a/debian/patches/0110-dll_backend_conf.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Add a header to dll.conf
- Document dll.conf in a header, point to the dll.d directory for external
- backends and document the net backend w/ pointers to the manpages.
- .
- Also remove the pint backend as it's not available on our platforms.
-Author: Julien BLACHE <jblache@debian.org>
-
-Index: trunk/backend/dll.conf.in
-===================================================================
---- trunk.orig/backend/dll.conf.in
-+++ trunk/backend/dll.conf.in
-@@ -1,4 +1,12 @@
--# enable the next line if you want to allow access through the network:
-+# /etc/sane.d/dll.conf - Configuration file for the SANE dynamic backend loader
-+#
-+# Backends can also be enabled by configuration snippets under
-+# /etc/sane.d/dll.d directory -- packages providing backends should drop
-+# a config file similar to dll.conf in this directory, named after the package.
-+#
-+
-+# The next line enables the network backend; comment it out if you don't need
-+# to use a remote SANE scanner over the network - see sane-net(5) and saned(8)
- net
- abaton
- agfafocus
-@@ -58,7 +66,6 @@ nec
- niash
- #p5
- pie
--pint
- pixma
- plustek
- #plustek_pp