Please merge maelstrom 1.4.3-L3.0.6-8 (multiverse) from Debian unstable (non-free)

Angel, your patch is not correct 100%. There are some issues in debian/changelog with unnecessary changes like:
-
+

I'm attaching correct-looking debdiff. Please compare your and mine debdiff. In future you should be better in adding changes to debian/changelog.

Merge is not valid. Desktop file doesn't work. I think that it's causes by changes in debian/menu file. If you are adding changes to package, please compare Ubuntu delta to changes incorporated in Debian. You can read patch from Merge-o-Matic called maelstrom_1.4.3-L3.0.6-8.patch. Please also test package before submitting debdiff.

I'm unsubscribing ubuntu-sponsors, please resubscibe when updated debdiff is ready.

Hi! I re-uploaded debdiffs, I update desktop file with latest desktop-file-validate and update desktop and xmp rules.

Thanks for the advice about + - in changelog.

Uploaded with minor changes in debian/changelog. Please forward desktop file to Debian and bashism to Debian bug #581483.
Thank you for your contribution!

This bug was fixed in the package maelstrom - 1.4.3-L3.0.6-8ubuntu1

---------------
maelstrom (1.4.3-L3.0.6-8ubuntu1) natty; urgency=low

  * Merge from debian testing (LP: #669904). Remaining changes:
    - Re-added desktop file, updated to validate with latest
      desktop-file-validate and install icon in /usr/share/pixmaps
    - debian/rules: bashism for cp'ing /usr/share/misc/config.{guess,sub}
      (Closes: #581483)
 -- Angel Abad <email address hidden> Wed, 03 Nov 2010 13:48:06 +0100

Angel, you should prepare a full patch for supporting .desktop file, including necessary changes in Debian. For forwarding changes you can use script submittodebian from package ubuntu-dev-tools.

Another way, you can send a message to BTS (<email address hidden>) including contents:

Package:
Version:
Tags: patch

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/

We thought you might be interested in doing the same.