← Back to branch summary

~ubuntu-branches/ubuntu/wily/sane-backends/wily

« back to all changes in this revision

Viewing changes to debian/patches/22_dll_backend_conf.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Julien BLACHE
  • Date: 2009-12-12 11:33:09 UTC
  • Revision ID: james.westby@ubuntu.com-20091212113309-j45gho4oh9lo79xs
Tags: 1.0.20-10
http://bugs.debian.org/558648
http://bugs.debian.org/556877
http://bugs.debian.org/556912
http://bugs.debian.org/555971
* debian/libsane.README.Debian:
  + Updated udev-related information and instructions, added a note about
    only adding rules for scanners supported by libsane.
* debian/sane-utils.saned.init:
  + Add missing --oknodo in s-s-d stop call in restart case
    (closes: #558648).
* debian/sane-utils.templates:
  + Rework the standalone saned template and mention Avahi explicitly
    (closes: #556877).

* debian/patches/22_dll_backend_conf.dpatch:
  + Updated; use better wording for the comment about the net backend
    in dll.conf (closes: #556912).
* debian/patches/32_epson_perfection636.dpatch:
  + Added; add the Epson Perfection 636 SCSI scanner (closes: #555971).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/22_dll_backend_conf.dpatch
27
27
 
28
28
@DPATCH@
29
29
diff -urNad sane-backends-1.0.20~/backend/dll.conf.in sane-backends-1.0.20/backend/dll.conf.in
30
 
--- sane-backends-1.0.20~/backend/dll.conf.in   2009-03-04 15:55:34.000000000 +0100
31
 
+++ sane-backends-1.0.20/backend/dll.conf.in    2009-05-04 11:04:16.561451202 +0200
32
 
@@ -1,3 +1,10 @@
 
30
--- sane-backends-1.0.20~/backend/dll.conf.in   2009-12-12 11:05:50.000000000 +0100
 
31
+++ sane-backends-1.0.20/backend/dll.conf.in    2009-12-12 11:15:37.863890108 +0100
 
32
@@ -1,4 +1,12 @@
 
33
-# enable the next line if you want to allow access through the network:
33
34
+# /etc/sane.d/dll.conf - Configuration file for the SANE dynamic backend loader
34
35
+#
35
36
+# Backends can also be enabled by configuration snippets under
37
38
+# a config file similar to dll.conf in this directory, named after the package.
38
39
+#
39
40
+
40
 
 # enable the next line if you want to allow access through the network:
 
41
+# The next line enables the network backend; comment it out if you don't need
 
42
+# to use a remote SANE scanner over the network - see sane-net(5) and saned(8)
41
43
 net
42
44
 abaton
43
 
@@ -51,7 +58,6 @@
 
45
 agfafocus
 
46
@@ -51,7 +59,6 @@
44
47
 nec
45
48
 niash
46
49
 pie