~ubuntu-branches/ubuntu/saucy/xsane/saucy

Viewing all changes in revision 31.

  • Committer: Bazaar Package Importer
  • Author(s): Angel Abad
  • Date: 2011-06-13 18:19:36 UTC
  • mfrom: (2.1.11 sid)
  • Revision ID: james.westby@ubuntu.com-20110613181936-9f4fsqfzn66q4kan
Tags: 0.998-2ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Disable compiler optimization for thumb2/armv7.
  - debian/patches/pot_desktop_msgid.patch: Add .desktop file Name and
    Comment to the POT.
  - debian/control:
    + Depend on firefox instead of iceweasel.
  - debian/xsane.desktop:
    + Use generic scanner icon instead of out-dated/confusing xsane icon
    + Modified to match POT changes
* Dropped change, fixed in Debian:
  - Fix umask permitions
    + debian/patches/fix_umask_permitions.patch
* debian/xsane.desktop:
  - Adjust Categories for desktop-file-validate

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: