lp:~ari-tczew/sane-backends/ubuntu
- Get this branch:
- bzr branch lp:~ari-tczew/sane-backends/ubuntu
Branch merges
- Ubuntu Desktop: Pending requested
-
Diff: 2753 lines (+1076/-733)45 files modifieddebian/changelog (+136/-373)
debian/compat (+1/-1)
debian/control (+49/-11)
debian/copyright (+1/-1)
debian/libsane-dev.install (+3/-3)
debian/libsane.README.Debian (+1/-1)
debian/libsane.install (+4/-4)
debian/libsane.postinst (+9/-3)
debian/libsane.postrm (+0/-2)
debian/patches/disable_v4l.patch (+1/-1)
debian/patches/fix-FTBFS-format-not-a-string-literal-error.patch (+30/-0)
debian/patches/fix-for-broken-tpu-scan.patch (+19/-0)
debian/patches/fix-gl646-setup-registers.patch (+67/-0)
debian/patches/frontend_libs.patch (+46/-0)
debian/patches/kfreebsd.patch (+17/-0)
debian/patches/libsane_deps.patch (+33/-12)
debian/patches/multiarch_dll_search_path.patch (+22/-9)
debian/patches/multiarch_manpages_libdir.patch (+18/-5)
debian/patches/series (+9/-17)
debian/patches/trim-libraries-in-sane-backends.pc.in.patch (+26/-0)
debian/patches/unneeded_doc.patch (+41/-15)
debian/po/ca.po (+116/-0)
debian/po/cs.po (+3/-2)
debian/po/da.po (+14/-13)
debian/po/de.po (+1/-0)
debian/po/es.po (+58/-35)
debian/po/eu.po (+5/-16)
debian/po/fr.po (+3/-13)
debian/po/gl.po (+1/-0)
debian/po/it.po (+1/-0)
debian/po/ja.po (+1/-0)
debian/po/nl.po (+1/-1)
debian/po/pl.po (+114/-0)
debian/po/pt.po (+1/-13)
debian/po/pt_BR.po (+3/-15)
debian/po/ru.po (+5/-15)
debian/po/sk.po (+112/-0)
debian/po/sv.po (+1/-12)
debian/po/vi.po (+24/-25)
debian/po/zh_CN.po (+1/-1)
debian/rules (+47/-104)
debian/sane-utils.config (+1/-0)
debian/sane-utils.install (+6/-5)
debian/sane-utils.postinst (+8/-5)
debian/sane-utils.templates (+16/-0)
Related bugs
Bug #729283: Merge sane-backends 1.0.22-1 (main) from Debian unstable (main) | Wishlist | Fix Released |
|
Bug #739708: Merge sane-backends 1.0.22-2 (main) from Debian unstable (main) | Low | Fix Released |
|
Related blueprints
Branch information
Recent revisions
- 25. By Artur Rona
-
* debian/
patches/ fix-gl646- setup-registers .patch:
- Fix crash using some HP scanners (LP: #1301161)
* Build against libgphoto2-dev instead of libgphoto2-6-dev. (Reverts Ubuntu
specific delta)
* debian/{control, rules}: Build with dh-autoreconf for new libtool.
* debian/patches/ *.patch: Patch Makefile.am too, not just Makefile.in.
* Merge with Debian unstable. Remaining Ubuntu changes:
- Build against libgphoto2-6 and libtiff5.
- 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/rules: Link using -Bsymbolic-functions (startup time
optimization).
- debian/rules, debian/sane-utils. saned.init: Don't call init script on
shutdown, it's unnecessary.
- disable_v4l.patch, fix_avahi_error_paths. patch,
fix-for-broken- tpu-scan. patch: See patch headers.
* QA upload
* revert move to libtiff5-dev
* QA upload.
* Add sane-desc.c_debian_ mods.patch to series file. (Closes: #714993)
* QA upload.
* Upload to unstable.
* This package has been orphaned. Set maintainer to the Debian QA Group.
* Bump compat level to 9 (was 5) and require debhelper >= 9.
* debian/control:
- sane-utils: Inherit Section: graphics from source package sane-backends.
- Remove versioned dependencies. They are trivially satisfied.
* Drop the following patches. They are merged upstream now.
- fix_v4l_build.patch
- hurd_path_max_fix. patch
- sane_desc_udev+acl. patch
- scanimage_man_batch_ start.patch
- udev_usb_suspend. patch
- xerox_mfp_add_scx_ 4623fw. patch
- xerox_mfp_fix_usb_ device. patch
* Drop disable_rpath.patch because the RPATH is already removed by chrpath
in debian/rules.
* Rebase and refresh all other patches against the new upstream relase.
* debian/rules:
- Simplify debian/rules by using dh sequencer.
- Build with --parallel and with autotools_dev.
- Enable all hardening build flags.
- Install umax_pp with sane-utils.install.
* Build-Depend on libtiff5-dev. Thanks to Michael Terry for the patch.
(Closes: #681079)
* Build-Depend on libusb-1.0-0-dev and enable libusb1.0 support in
debian/rules. Thanks to Martin Pitt for the report and Whoopie for the
patch. (Closes: #687137)
* Non-maintainer upload.
* New upstream version.
* Non-maintainer upload.
* Compress all binaries with xz to free up some space on CD#1.
* Non-maintainer upload.
* Fix build failure on kfreebsd (closes: #680234).
* Non-maintainer upload.
* Set sane-utils as 'Multi-Arch: foreign' (closes: #675797).
* Non-maintainer upload.
* Fix pending l10n issues. Debconf translations:
- Catalan; (Innocent De Marchi). Closes: #646505
- Slovak (Slavko). Closes: #639235
- Polish (Michał Kułach). Closes: #658351
+ Build-Depends: xutils-dev instead of xutils.
#72341)
#60923).
* temporarily comment out artec in dll.conf, due to bad interaction with
dll.conf
<email address hidden> (fixes bug #26545)
to work
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:sane-backends