~ubuntu-branches/ubuntu/quantal/kwalletcli/quantal

Viewing all changes in revision 7.

  • Committer: Bazaar Package Importer
  • Author(s): Angel Abad
  • Date: 2010-11-16 23:38:21 UTC
  • mfrom: (4.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20101116233821-k43sgi2hluulild0
Tags: 2.03-1ubuntu1
* Merge from debian unstable (LP: #676299). Remaining changes:
  - Remove optional dependency on pinentry-qt, as it is no longer built
    from source and this optional dependency was preventing its removal
* Dropped change (superceded in Debian):
  - Fix FTBFS due to indirect linking.
    + Add 01_fix_build_indirect_linking.diff

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: