Please merge cuyo 2.~-1.1.brl3-1 (universe) from Debian unstable (main)

Trying an update with bazaar merges, but I dont know what is the best procedure for sponsors. What do you prefer? Bazaar merges or debdiffs?

Thanks!

This bug was fixed in the package cuyo - 2.~-1.1.brl3-1ubuntu1

---------------
cuyo (2.~-1.1.brl3-1ubuntu1) maverick; urgency=low

  * Merge from debian unstable (LP: #607106). Remaining changes:
    - Don't register MimeType=application/x-executable in
      the .desktop file.
    - Remove UTF-8 in the .desktop file
    -

cuyo (2.~-1.1.brl3-1) unstable; urgency=low

  * forked uptream version without povray images
  * fix build-errors with gcc-4.4 (Closes: 504947)
  * switch to source format 3.0

cuyo (2.~-1.1-1ubuntu3) karmic; urgency=low

  * Don't regester MimeType=application/x-executable in
    the .desktop file. (LP: #386438)
  * debian/patchs: Move all Ubuntu inline changes into quilt patches.
   - gcc4.4.patch, makefile-fixes.patch, and desktop-file-fixes.patch
  * debian/control: Build depend on quilt.
  * debian/rules: Add quilt magic. Drop deprecated dh_desktop call.

cuyo (2.~-1.1-1ubuntu2) karmic; urgency=low

  * Added missing header to fix FTBFS, thanks to Martin Michlmayr
    (LP: #428593).

cuyo (2.~-1.1-1ubuntu1) hardy; urgency=low

  * Merge from Debian unstable. Remaining changes:
    - Add installation of upstream icons and .desktop file
    - Correct upstream .desktop file to be compliant with latest
      freedesktop.org specification and Gnome HIG
    - Correct upstream Makefile(s) so that icons and desktop files are installed
      in the right directory (/usr/share instead of /usr/share/games).
    - Modify Maintainer value to match Debian-Maintainer-Field Spec
  * Bump debhelper version to 5.0.51, required by dh_icons.

cuyo (2.~-1.1-1) unstable; urgency=low

  * new bugfix upstream version
  - now also builds with gcc-4.3 (Closes: 461955)
  * increase debhelper compatibility level to 5

cuyo (2.~-1.0-1ubuntu1) hardy; urgency=low

  * Sync from debian unstable:
    - drop ubuntu .desktop file
  * Add installation of upstream icons and .desktop file
  * Correct upstream .desktop file to be compliant with latest
    freedesktop.org specification and Gnome HIG
  * Correct upstream Makefile(s) so that icons and desktop files are installed
    in the right directory (/usr/share instead of /usr/share/games).
  * Modify Maintainer value to match Debian-Maintainer-Field Spec

cuyo (2.~-1.0-1) unstable; urgency=low

  * new upstream release

cuyo (2.~-1.0~beta1-1) experimental; urgency=low

  * new upstream prerelease
  * split architecture independent data into cuyo-data package
  * add Homepage: and Vcs-* headers
  * update debian/copyright

cuyo (2.~-1.0~alpha1-1) experimental; urgency=low

  * new upstream prerelease
  - new graphic routines (Closes: 208688)
  - adds small mode (Closes: 148822)
  * updated build-dependencies as this now uses SDL instead of QT
  * tidied up debian/rules
  * bumped Standards-version
  * add watch file

cuyo (1.8.6-1ubuntu1) feisty; urgency=low

  * create and install .desktop file (Closes: LP#90768)

cuyo (1.8.6-1) unstable; urgency=low

  * new version (mostly new levels and code needed for that)
  * general clean-up:
    - update debian/copyrights
    - move icon to /usr/share/pixmaps
    - quote all values in debian/menu
    - bump standards version
  * add versioned build-depend to ...