Merge with Debian 1.0.0-2

Merge is complete:

In the series of attachments you will find:

debdiff for tomboy-1.0.0-2 to tomboy-1.0.0-2ubuntu1
debdiff for tomboy-1.0.0-0ubuntu2 to tomboy-1.0.0-2ubuntu1
sbuild logs for i386 and amd64 built

Also I tested the application in a schroot and verified that the application functions correctly.

There is one warning that is given:
Gtk-Message: Failed to load module "canberra-gtk-module": libcanberra-gtk-module.so: cannot open shared object file: No such file or directory

I did some searching around and I found that:
a) this warning is also present in the karmic version tomboy-1.0.0-0ubuntu2
b) this packages is not actually ever used directly by tomboy
c) I was unable to determine exactly why the warning was being printed. I did discover that it was printed inside of the call in line 81 src/Tomboy/Tomboy.cs: Initialize ("tomboy", "tomboy", "tomboy", args);

Thank you for your work there

This bug was fixed in the package tomboy - 1.0.0-2ubuntu1

---------------
tomboy (1.0.0-2ubuntu1) lucid; urgency=low

  * Merge from debian unstable (LP: #481657), remaining changes:

      * debian/control:
        - Added BZR link
      * debian/patches/03_u1_as_default_sync.patch
        Added patch to make ubuntuone.com the default sync server (LP: #416865)
 -- Manny Vindiola <email address hidden> Sat, 14 Nov 2009 00:25:03 -0500