~ubuntu-branches/ubuntu/precise/sane-backends/precise

« back to all changes in this revision

Viewing changes to debian/patches/dll_backend_conf.patch

  • Committer: Bazaar Package Importer
  • Author(s): Artur Rona, Artur Rona, Martin Pitt
  • Date: 2011-03-07 15:01:07 UTC
  • mfrom: (2.3.20 sid)
  • Revision ID: james.westby@ubuntu.com-20110307150107-h2cmuy76cxroatv0
Tags: 1.0.22-1ubuntu1
[ Artur Rona ]
* Merge from debian unstable.  Remaining changes: (LP: #729283)
  - debian/control:
    + Demote libsane-extras* from Recommends to Suggests, as long as
      this package is in universe.
    + Demote sane-utils from Recommends to Suggests.
      We do not want to have an init script for saned laying around,
      which is disabled by default anyway.
  - debian/libsane.postinst: Don't create a scanner group.
  - debian/libsane.preinst:
    + Remove the old file if unmodified.
    + Remove the old blacklist-scanner modprobe file.
  - debian/patches/disable_v4l.patch: Disable v4l backend.
  - debian/rules:
    - Link using -Bsymbolic-functions (startup time optimization).
    - Saned init script does not need to be started before gdm
      and does not need to be called on shutdown.
  - debian/sane-utils.*: No longer have scanner group.
  - debian/sane-utils.saned.init: Saned init script does not need to
    be started before gdm and does not need to be called on shutdown.

[ Martin Pitt ]
* Drop ubuntu_udev_noperm.patch. It's superseded by Debian's
  sane-desc_udev+acl.patch. This also brings back the accidentally dropped
  SCSI scanner rules. (LP: #727696)
* debian/rules: Drop "acl" dependency. Current udev releases already
  evaluate the "libsane_matched" property, so we don't need the sane rules
  to do that again. Also drop the alternative "makedev" dependency; we
  only support udev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
7
7
 
8
8
Index: sane-backends-1.0.22/backend/dll.conf.in
9
9
===================================================================
10
 
--- sane-backends-1.0.22.orig/backend/dll.conf.in       2011-01-16 12:01:28.000000000 +1100
11
 
+++ sane-backends-1.0.22/backend/dll.conf.in    2011-02-14 15:06:16.360503589 +1100
 
10
--- sane-backends-1.0.22.orig/backend/dll.conf.in       2011-01-16 02:01:28.000000000 +0100
 
11
+++ sane-backends-1.0.22/backend/dll.conf.in    2011-02-14 19:02:42.925016002 +0100
12
12
@@ -1,4 +1,12 @@
13
13
-# enable the next line if you want to allow access through the network:
14
14
+# /etc/sane.d/dll.conf - Configuration file for the SANE dynamic backend loader