[ 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.