lp:~ari-tczew/sane-backends/lp-693578
- Get this branch:
- bzr branch lp:~ari-tczew/sane-backends/lp-693578
Branch merges
- Robert Ancell: Pending requested
-
Diff: 675 lines (+552/-9)14 files modifieddebian/changelog (+251/-0)
debian/control (+1/-1)
debian/patches/allow_dll.d_symlinks.patch (+27/-0)
debian/patches/disable_v4l.patch (+3/-2)
debian/patches/fix_epson2_cancel.patch (+18/-0)
debian/patches/fix_epson2_commands.patch (+21/-0)
debian/patches/genesys_disable_raw_data_log.patch (+20/-0)
debian/patches/no_translations.patch (+4/-2)
debian/patches/saned_exit_avahi_process.patch (+40/-0)
debian/patches/scsi_perfection_2450.patch (+33/-0)
debian/patches/scsi_scanjet_4c.patch (+18/-0)
debian/patches/series (+9/-0)
debian/patches/ubuntu_udev_noperm.patch (+2/-4)
debian/patches/xerox_mfp_new_ids.patch (+105/-0)
Related bugs
Bug #693578: Merge sane-backends 1.0.21-9 (main) from Debian unstable (main) | Undecided | Fix Released |
|
Related blueprints
Branch information
Recent revisions
- 4. By Artur Rona
-
* Merge from debian unstable. Remaining changes: (LP: #693578)
- debian/control:
+ Add Vcs-Bzr link related to Ubuntu Desktop Team.
+ Demote libsane-extras from Depends to Suggests, as long as
this package is in universe.
+ Demote sane-utils and avahi-daemon 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/ no_translations .patch:
+ Add missing translation files.
- 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/watch: Added to grab original tarball by uscan.
* debian/patches/ use_libsane_ matched_ for_scsi. patch: Removed.
This change is useless due to ubuntu_udev_noperm. patch.
* Note that tarballs md5sums are different in Debian and Ubuntu.
* debian/patches/ fix_epson2_ cancel. patch:
+ Added; fix handling of scanner errors by sending a cancel command
(closes: #597922).
* debian/patches/ fix_epson2_ commands. patch:
+ Added; fix list of supported commands for levels D1 and D2
(closes: #582066).
* debian/patches/ genesys_ disable_ raw_data_ log.patch:
+ Added; disable raw data logging. Raw data logging was enabled
upstream at some point before 1.0.21 most probably as an oversight
when committing new code. When enabled, a raw.pnm file is left
behind in the cwd when using the genesys backend (closes: 602995).
* debconf translations:
+ Properly install vi.po, mistakenly put in po/ instead of
debian/po in 1.0.21-6.
* debian/patches/ saned_exit_ avahi_process. patch:
+ Added; exit Avahi process on error/loop termination.
* debian/patches/ xerox_mfp_ new_ids. patch:
+ Added; add USB IDs for supported machines in xerox_mfp (closes: #601748).
* debian/patches/ scsi_perfection _2450.patch:
+ Added; add SCSI IDs for the Perfection 2450 via FireWire
(closes: #601810).
* debian/patches/ scsi_scanjet_ 4c.patch:
+ Added; add SCSI IDs for the ScanJet 4c (closes: #601656).
* debconf translations:
+ vi.po: courtesy of Clytie Siddall (closes: #601530).
* debconf translations:
+ cs.po: courtesy of Miroslav Kure (closes: #598338).
+ zh_CN.po: courtesy of YunQiang Su (closes: #599590, #599591).
+ da.po: courtesy of Joe Dalton (closes: #599642).
+ eu.po: courtesy of Iñaki Larrañaga Murgoitio (closes: #599810).
+ es.po: courtesy of Camaleón (closes: #600342).
+ fi.po: courtesy of Esko Arajärvi (closes: #600514).
* debconf translations:
+ it.po: courtesy of Luca Monducci (closes: #593722).
* debian/control:
+ Bump Standards-Version to 3.9.0 (no changes).
* debian/patches/ use_libsane_ matched_ for_scsi. patch:
+ Added; use libsane_matched for SCSI scanners rules too.
* debian/patches/ allow_dll. d_symlinks. patch:
+ Added; allow symlinks under /etc/sane.d/dll.d (closes: #588392).
* debian/patches/ 50_disable_ v4l.dpatch:
- Disable v4l backends (LP: #87312)
* Merge from Debian testing, remaining changes:
- Add 42_add_epson_cx_ 6000.dpatch: Add Epson CX6000. (LP: #314485)
- Add 43_scanadf_error_check. dpatch: Backport from Debian's
sane-backends git repo adding additional error checking.
(LP: #469540)
- Add 44_add_epson_mfp_ devs.dpatch: Add additional device id.
(LP: #469540)
- Don't apply 11_udev_147, because ubuntu_udev_noperm. dpatch is
more appropriate for Ubuntu:
+ 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/control:
+ Demote libsane-extras from Depends: to Suggests:, as long as
this package is in universe.
+ Demote sane-utils and avahi-daemon 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. dirs.linux: remove
- debian/{libsane. install. in,libsane- dev.install, rules}: Install
documentation into libsane-dev instead of libsane to save CD space.
- debian/rules:
+ Link using -Bsymbolic-functions (startup time optimization).
+ /etc/modprobe.d/libsane blacklists two modules that don't exist
anymore, dropped creation of this file
- debian{rules,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/libsane. postinst: Do not create the scanner group.
- debian/{sane-utils. config, sane-utils. postinst, sane-utils. templates} :
Drop the support for saned in the scanner group, since we don't have
a scanner group anymore!
- debian/libsane. preinst:
+ Remove the old blacklist-scanner modprobe file. LP: #340873.
+ Remove the old file if unmodified
- debian/rules: Install udev rules again, since we now don't rely on
hal any more and thus we need the ENV{libsane_matched} =="yes" flag.
* debian/sane-utils. saned.init: be quiet if not enabled
(LP: #440852)
* debian/control: Fix libsane-extras Recommends → Suggests again.
* ubuntu_udev_noperm. dpatch: Use ENV{DEVTYPE} instead of SUBSYSTEM, to avoid
processing all the rules twice.
* Merge from debian unstable, remaining changes:
- Add 42_add_epson_cx_ 6000.dpatch: Add Epson CX6000. (LP: #314485)
- debian/control:
+ Set Ubuntu maintainer address.
+ Demote libsane-extras from Depends: to Suggests:, as long as
this package is in universe.
+ Demote sane-utils and avahi-daemon 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. dirs.linux: remove
- debian/{libsane. install. in,libsane- dev.install, rules}: Install
documentation into libsane-dev instead of libsane to save CD space.
- debian/rules:
+ Link using -Bsymbolic-functions (startup time optimization).
+ /etc/modprobe.d/libsane blacklists two modules that don't exist
anymore, dropped creation of this file
- debian{rules,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/libsane. postinst: Do not create the scanner group.
- debian/{sane-utils. config, sane-utils. postinst, sane-utils. templates} :
Drop the support for saned in the scanner group, since we don't have
a scanner group anymore!
- debian/libsane. preinst:
+ Remove the old blacklist-scanner modprobe file. LP: #340873.
+ Remove the old file if unmodified
* Add ubuntu_udev_noperm. dpatch: Change udev rules to be suitable for
Ubuntu:
- 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: Install udev rules again, since we now don't rely on
hal any more and thus we need the ENV{libsane_matched} =="yes" flag.
* Merge from debian unstable (LP: #373168), remaining changes:
- Add 42_add_epson_cx_ 6000.dpatch: Add Epson CX6000. (LP: #314485)
- debian/control:
+ Set Ubuntu maintainer address.
+ Demote libsane-extras from Depends: to Suggests:, as long as
this package is in universe.
+ Demote sane-utils and avahi-daemon 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. dirs.linux: remove
- debian/{libsane. install. in,libsane- dev.install, rules}: Install
documentation into libsane-dev instead of libsane to save CD space.
- debian/rules:
+ Link using -Bsymbolic-functions (startup time optimization).
+ Do not install the udev rules, since hal now provides dynamic ACLs on
device nodes. (See hardy-hardware-detection spec.)
+ /etc/modprobe.d/libsane blacklists two modules that don't exist
anymore, dropped creation of this file
- debian{rules,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/libsane. postinst: Do not create the scanner group.
- debian/{sane-utils. config, sane-utils. postinst, sane-utils. templates} :
Drop the support for saned in the scanner group, since we don't have
a scanner group anymore!
- debian/libsane. preinst:
+ Remove the old blacklist-scanner modprobe file. LP: #340873.
+ Remove the old file if unmodified - 3. By Robert Ancell
-
* debian/
libsane. install. in:
- Re-enable /usr/share/locale
* debian/patches/ no_translations .patch:
- Add missing translation files - 2. By Robert Ancell
-
* Merge with Debian unstable, remaining Ubuntu changes:
* debian/control:
- Add Vcs-Bzr link
- Demote libsane-extras from Depends: to Suggests:, as long as
this package is in universe.
- Demote sane-utils and avahi-daemon from Recommends to Suggests.
We do not want to have an init script for saned laying around,
which is disabled by default anyway.
* debian/rules:
- Link using -Bsymbolic-functions (startup time optimization).
- saned init script does not need
* debian/libsane. install. in:
- No files to install from /usr/share/locale
* 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/sane-utils. config:
- No longer have scanner group
* debian/sane-utils. postinst:
- 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/sane-utils. templates:
- No longer have scanner group
* 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/patches/ disable_ v4l.patch:
- Disable v4l backend
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)