~jtaylor/ubuntu/oneiric/gajim/multiple-CVE

Viewing all changes in revision 50.

  • Committer: Bazaar Package Importer
  • Author(s): Angel Abad
  • Date: 2010-09-14 11:16:21 UTC
  • mfrom: (1.2.10 sid)
  • Revision ID: james.westby@ubuntu.com-20100914111621-ne454oavvk0orey1
Tags: 0.13.4-2ubuntu1
* Merge from debian unstable (LP: #662154). Remaining changes:
  - Updated debian/watch
  - Kept Ubuntu patches
    + config-write-sync.patch
    + ubuntu-keyring.patch
* Dropped change: (superceeded in debian)
  - Changed python build version from 2.5 to 2.6 in debian/rules
 

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: