~ubuntu-branches/ubuntu/natty/gnome-do/natty

Viewing all changes in revision 18.

  • Committer: Iain Lane
  • Date: 2010-10-01 09:56:37 UTC
  • mfrom: (0.1.7 sid)
  • Revision ID: laney@ubuntu.com-20101001095637-4516a7swozuom0s6
* Merge with Debian unstable, remaining changes:
  + debian/patches/03_fix_gks_crashers.dpatch:
    - Proxy keyring calls to the GTK main thread.  Prevents libgnome-keyring
      taking down Do with an assert().  
* debian/patches/03_disable_docky.dpatch: Add patch to disable Docky
  theme as this is now distributed as a separate project, in the docky
  package.
* debian/patches/04_dont_disable_deprecated.dpatch: Add patch to not
  build with *DISABLE_DEPRECATED. libdo uses deprecated symbols and
  FTBFS with these flags set. It's wrong to set them in release tarballs
  anyway.
* debian/control, debian/rules: Add dh-autoreconf to autoreconf in the
  build in order to pick up the above patches.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: