~blueyed/ubuntu/lucid/miro/merge-from-sid

Viewing all changes in revision 12.

  • Committer: Bazaar Package Importer
  • Author(s): Christopher James Halse Rogers
  • Date: 2008-08-18 07:53:05 UTC
  • mfrom: (1.2.1 upstream) (1.1.4 lenny)
  • Revision ID: james.westby@ubuntu.com-20080818075305-cx9zx9kj90n0ae7d
Tags: 1.2.6-0ubuntu1
* 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

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: