Please merge miro-1.2.3-2 (universe) from Debian unstable (main)

miro (1.2.3-2ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes: (closes LP: #255261)
    - debian/control: Bumped standards version to 3.8.0 with no changes.
  * Added Depend on python-gtkmozembed instead of python-gnome2-extras as we are only
    using the gtkmozembed module here
  * Added explicit build-dependency on pkg-config
  * Change paths in platform/gtk-x11, /portable, /portable/dl_daemon.
  * Updated python dependency.

 -- Bhavani Shankar <email address hidden> Wed, 06 Aug 2008 13:50:07 +0530

Hello there!

I'm not sure which of the two debdiff you've attached is the debdiff you expect to be applied to the current Ubuntu package? Also, have you built and installed this? We don't have a python-gtkmozembed package, for example.

miro (1.2.3-2ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes: (closes LP: #255261)
    - debian/control: Bumped standards version to 3.8.0 with no changes.
  * Added explicit build-dependency on pkg-config
  * Change paths in platform/gtk-x11, /portable, /portable/dl_daemon.
  * Updated python dependency.

 -- Bhavani Shankar <email address hidden> Thu, 07 Aug 2008 13:16:01 +0530

Can you in debian/changelog please just specify which Ubuntu changes need to remain?

"debian/control: Bumped standards version to 3.8.0 with no changes." and "Added explicit build-dependency on pkg-config" were both added in 1.2.3-2 (Debian).

Where does the "Change paths in platform/gtk-x11, /portable, /portable/dl_daemon." change come from? What about the other changes we introduced in the XubuntuY revisions?

Additionally, there is a new upstream version available; 1.2.6. It would be worth updating to the new version at the same time as merging these changes. If you're uncomfortable with doing this, I'll be happy to do the upgrade.

yes please

This bug was fixed in the package miro - 1.2.6-0ubuntu1

---------------
miro (1.2.6-0ubuntu1) intrepid; urgency=low

  * New upstream release (LP: #258401,#213667)
  * Merge from Debian first (LP: #255261)
    + New Ubuntu changes:
      - Depend on python-gnome2-extras rather than python-gtkmozembed
  * Drop unnecessary democracyplayer-data transitional package (LP: #242968)
  * debian/patches/91_fix_movie_dir_selector
    + Drop; this worked around a GTK+ bug which has been fixed
  * debian/patches/81_inhibit_gnome_screensaver
    + Inhibit GNOME Screensaver when playing fullscreen video. (LP: #207794)
      Patch based on patch from upstream trac:
      http://bugzilla.pculture.org/show_bug.cgi?id=3067
  * debian/rules
    + Add more detritus to the clean target

 -- Christopher James Halse Rogers <email address hidden> Mon, 18 Aug 2008 07:53:05 +1000