-
Committer:
Martin Pitt
-
Date:
2011-03-07 13:39:46 UTC
-
mfrom:
(5.1.1 ubuntu)
-
Revision ID:
martin.pitt@canonical.com-20110307133946-rbky9pchi3u62qv3
* 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/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
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.
* debian/patches/ubuntu_udev_noperm.patch: Disabled, complex, needs
fixing due to sane-desc_udev+acl.patch.
* New upstream release.
+ epson2: reject scan area settings that would lead to a division by zero
(closes: #581181).
* debian/control:
+ Bump Standards-Version to 3.9.1 (no changes).
+ Demote libsane-extras-* to Recommends again.
* debian/rules:
+ Add acl (>= 2.2.49-4) to udev substvar for ACL utilities in /bin.
+ Use sane-desc -m udev+acl (closes: #591767, #612815).
* debian/libsane.README.Debian:
+ Update; mention ConsoleKit and the udev rules now using ACLs.
* debian/patches/sane-desc_udev+acl.patch:
+ Added; compared to experimental, setfacl is now in /bin.
* debian/patches/fix_xerox_mfp_color_mode.patch,
debian/patches/use_libsane_matched_for_scsi.patch,
debian/patches/allow_dll.d_symlinks.patch,
debian/patches/saned_exit_avahi_process.patch,
debian/patches/xerox_mfp_new_ids.patch,
debian/patches/scsi_perfection_2450.patch,
debian/patches/scsi_scanjet_4c.patch,
debian/patches/genesys_disable_raw_data_log.patch,
debian/patches/fix_epson2_commands.patch,
debian/patches/fix_epson2_cancel.patch:
+ Removed; merged upstream.
* Git snapshot.
* debian/rules:
+ Add dependency on acl to libsane when depending on udev.
+ Use udev+acl mode when generating udev rules.
+ debian/patches/sane-desc_udev+acl.patch:
+ Added; try using ACLs for USB scanners in an effort to deconflict with
MFP devices.
* Git snapshot.
+ genesys now has some support for LiDE 100 & 200 (closes: #586189).