Please merge gxine_0.5.903-4(universe) from debian unstable(main)

Your debdiff includes a change to mime.default, but you do not mention this retained change in your changelog. If this change was intentional, please include it in debian/changelog. If it was not meant to be there, remove it. You also should attach your merge changelog entry to merge bugs in the future.

I'm unsubscribing the sponsors for now, but I will remain subscribed. Feel free to resubscribe the sponsors once you prepare a new debdiff.

The change was carried over by the previous packages I think..

here is the new diff

Uploaded. Keep up the good work Bhavani!

Thanks nathan. Hope to continue contributing with a single hand....

This bug was fixed in the package gxine - 0.5.903-4ubuntu1

---------------
gxine (0.5.903-4ubuntu1) jaunty; urgency=low

  * Merge from debian unstable, remaining changes: LP: #313253
    - debian/control: added Xb-Npp-xxx,Xb-Npp-Description and Xb-Npp-File tags.
    - debian/gxineplugin.links: link plugin to xulrunner-addons/plugins
      directory
    - Add dvd,vcd,svcd tags to mime.default.

gxine (0.5.903-4) unstable; urgency=low

  * Fix implict conversion to pointer (possible segfault). (Closes: #510363)

gxine (0.5.903-3) unstable; urgency=low

  * If gxine is already running, don't start up another instance if
    ~/.gxine/socket is missing. (Was checking the wrong location.)
    (Closes: #479232)
  * Avoid GTK spamming the console when gxine tries to add text containing
    invalid UTF-8 to the console log window.
  * Spanish translation update.
  * Documentation update regarding screen blanking.

 -- Bhavani Shankar <email address hidden> Fri, 02 Jan 2009 23:31:13 +0530

mime.default is (presently) unused.

You probably want to patch xine-list-1.1 to output these; and if you think
that that'd be more widely useful, file a wishlist item upstream or in the
Debian BTS. We may need some convincing, though :-)

Also, Xb-Npp-MimeType (for gxineplugin) isn't necessarily accurate. It
depends on which xine-lib packages are installed, and which versions...