~ubuntu-branches/ubuntu/oneiric/tomboy/oneiric-proposed

Viewing all changes in revision 82.

  • Committer: Bazaar Package Importer
  • Author(s): Iain Lane
  • Date: 2011-08-23 22:47:32 UTC
  • mfrom: (1.5.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20110823224732-9230w0dhdareicbi
Tags: 1.7.4-1ubuntu1
* Merge with Debian experimental, remaning changes:
  + Use dh-translations
  + Ubuntu patches:
    - Add Launchpad integration
    - Use Ubuntu One SSO
    - Add app indicator support
    - Use Ubuntu One as default sync server
    - Add initial note about Ubuntu One
  + autoreconf for some of the above changes
  + Run dh_autoreconf with --as-needed to enable support in ltmain.sh
* [268e4a9] Update 03_u1_as_default_sync to apply against new source
* [26f26a0] Update gbp.conf for Ubuntu branch
* [c61756e] Update 06_ubuntu_sso.patch for new SyncService interface

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: