~ubuntu-desktop/sane-backends/ubuntu

Committer: Martin Pitt
Date: 2011-03-07 13:42:39 UTC
Revision ID: martin.pitt@canonical.com-20110307134239-2xkk9w5m6us4bffc

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)

files removed:
debian/patches/ubuntu_udev_noperm.patch

files modified:
debian/changelog

debian/patches/series

Show diffs side-by-side

added added

removed removed

debian/changelog

sane-backends (1.0.22-1ubuntu1) UNRELEASED; urgency=low

[ Artur Rona ]

* Merge from debian unstable. Remaining changes: (LP: #729283)

- debian/control:

+ Demote libsane-extras* from Recommends to Suggests, as long as

+ Remove the old file if unmodified.

+ Remove the old blacklist-scanner modprobe file.

- debian/patches/disable_v4l.patch: Disable v4l backend.

- debian/patches/ubuntu_udev_noperm.patch:

+ Do not change device permissions (already covered

by udev-extra's 70-acl.rules).

+ Do not cover SCSI scanners (already covered by udev-extra's

70-acl.rules).

+ Simplify description and structure.

- debian/rules:

- Link using -Bsymbolic-functions (startup time optimization).

- Saned init script does not need to be started before gdm

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

* debian/patches/ubuntu_udev_noperm.patch: Disabled, complex, needs

fixing due to sane-desc_udev+acl.patch.

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

-- Artur Rona <ari-tczew@ubuntu.com> Fri, 04 Mar 2011 21:04:56 +0100

Older »