← Back to branch summary

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

Viewing all changes in revision 49.

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Michalon
  • Date: 2010-05-25 18:54:10 UTC
  • mfrom: (1.1.17 upstream) (1.2.9 sid)
  • Revision ID: james.westby@ubuntu.com-20100525185410-z6tgrrsnf986a32q
Tags: 0.13.4-1ubuntu1
https://launchpad.net/bugs/506049
* Merge from debian testing (LP: #506049), remaining changes:
  - Updated debian/watch
  - Kept Ubuntu patches
    + config-write-sync.patch
    + ubuntu-keyring.patch
  - 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: