-
Committer:
Bazaar Package Importer
-
Author(s):
Robert Ancell
-
Date:
2009-06-30 15:12:41 UTC
-
mfrom:
(2.1.5 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090630151241-5u03m6j7l1e0m1g7
Tags: 0.996-2ubuntu1
* Merge with Debian unstable, remaining changes (LP: #393733)
- debian/patches/13_pot_desktop_msgid.dpatch: Add .desktop file Name and
Comment to the POT.
- debian/control:
- Build separate xsane doc package.
- Depend on firefox instead of iceweasel.
- Rename xsane-common.doc-base to xsane-doc.doc-base.
- debian/xsane.desktop:
- Use generic scanner icon instead of out-dated/confusing xsane icon
* debian/control:
- Add Vcz link