Please merge bookmarkbridge 0.76-2.2 (Universe) from Debian testing (main)

Thanks for your work on this. After reviewing the patch, the following still needs work:
1. the changelog needs to have all the historical ubuntu changes. For example, the changelog for 0.76-2.1ubuntu2 and 0.76-2.1ubuntu1 are missing (there are surely others)
2. when Debian has included an Ubuntu patch, when performing the merge you should say something like this in the changelog:
 * Dropped the following changes that are now included upstream/in Debian
   - foo
   - bar
3. it uses the wrong syntax to close bugs in launchpad:
(Closes: 513949)
should be (the parenthesis are optional):
(LP: #513949)

New debdiff should address all documented issues as well as a potential build conflict.

Thanks Brian!

I reviewed this and it is very close, however a couple of things remain:
1. the package builds fine without your qt3-dev-tools change. How are you building the package? I suggest using pbuilder or sbuild. See https://wiki.ubuntu.com/PbuilderHowto for details. Please remove this from the debdiff (or explain why it is needed in a clean build environment)
2. please update the timestamp in the changelog by using 'dch -r'

Leaving the patch-needswork tag.

Thanks as always for the help Jamie! This one should be good to go.

Looks good, uploaded. Thanks Brian!

This bug was fixed in the package bookmarkbridge - 0.76-2.2ubuntu1

---------------
bookmarkbridge (0.76-2.2ubuntu1) lucid; urgency=low

  * Merge from debian testing. (LP: #513949) Remaining changes:
    + debian/debian/bookmarkbridge.xpm:
      - Provide an icon.
    + debian/bookmarkbridge.desktop:
      - Provide a .desktop file.
    + debian/dirs:
      - Create /usr/share/applications and /usr/share/pixmaps.
    + debian/rules:
      - Install icon and .desktop file.
    + debian/control:
      - Update Maintainer field as per spec.
  * Dropped the following changes that are now included in Debian:
    - debian/patches/03_fix_missing_include.dpatch

bookmarkbridge (0.76-2.2) unstable; urgency=low

  * Non-maintainer upload.
  * Fix FTBFS: missing #include for GCC 4.4 (Closes: #504871)
  * debian/watch added
 -- Brian Thomason <email address hidden> Tue, 09 Feb 2010 15:10:33 -0500