Merge lp://staging/~gilir/gnome-mplayer/gecko-mediaplayer into lp://staging/~norsetto/gnome-mplayer/gecko-mediaplayer

Proposed by Julien Lavergne
Status: Needs review
Proposed branch: lp://staging/~gilir/gnome-mplayer/gecko-mediaplayer
Merge into: lp://staging/~norsetto/gnome-mplayer/gecko-mediaplayer
Diff against target: 3689 lines (+3601/-5)
9 files modified
.bzr-builddeb/default.conf (+2/-0)
debian/changelog (+63/-3)
debian/control (+1/-1)
debian/patches/90_svn420_fix_null.patch (+41/-0)
debian/patches/91_svn421_disable_npp_initialize.patch (+22/-0)
debian/patches/autotools.patch (+3229/-0)
debian/patches/dont_use_libxul.patch (+236/-0)
debian/patches/series (+4/-0)
debian/rules (+3/-1)
To merge this branch: bzr merge lp://staging/~gilir/gnome-mplayer/gecko-mediaplayer
Reviewer Review Type Date Requested Status
Cesare Tirabassi Pending
Review via email: mp+49721@code.staging.launchpad.net

This proposal supersedes a proposal from 2011-02-14.

Description of the change

Update to 1.0.0 version

To post a comment you must log in.
61. By Julien Lavergne

* debian/control:
 - Build-depends on xulrunner-1.9.2-dev until bug #724070 is fixed.

62. By Julien Lavergne

releasing version 1.0.0-0ubuntu2

63. By Julien Lavergne

Merge with uploaded changes

64. By Julien Lavergne

* Don't use any Mozilla interfaces at all. The only interfaces used
  previously were nsIPrefBranch and nsIPrefService to change a preference
  which configured the UA string to "QuickTime/7.6.4". This functionality
  is Firefox specific anyway, and so doesn't work in any Webkit based browser
  (Chromium, Epiphany, Midori etc). It also doesn't work in Firefox 4
  and later since the plugin is running in a separate process, where setting
  prefs in the plugin process has no effect on the browser process at all
  - add debian/patches/dont_use_libxul.patch
  - add debian/patches/autotools.patch
  - update debian/patches/series
  - update debian/control to build-depend on firefox-dev
  - see https://blueprints.launchpad.net/ubuntu/+spec/
          desktop-o-mozilla-rapid-release-maintenance and
    https://lists.ubuntu.com/archives/ubuntu-devel/2011-May/033229.html

Unmerged revisions

64. By Julien Lavergne

* Don't use any Mozilla interfaces at all. The only interfaces used
  previously were nsIPrefBranch and nsIPrefService to change a preference
  which configured the UA string to "QuickTime/7.6.4". This functionality
  is Firefox specific anyway, and so doesn't work in any Webkit based browser
  (Chromium, Epiphany, Midori etc). It also doesn't work in Firefox 4
  and later since the plugin is running in a separate process, where setting
  prefs in the plugin process has no effect on the browser process at all
  - add debian/patches/dont_use_libxul.patch
  - add debian/patches/autotools.patch
  - update debian/patches/series
  - update debian/control to build-depend on firefox-dev
  - see https://blueprints.launchpad.net/ubuntu/+spec/
          desktop-o-mozilla-rapid-release-maintenance and
    https://lists.ubuntu.com/archives/ubuntu-devel/2011-May/033229.html

63. By Julien Lavergne

Merge with uploaded changes

62. By Julien Lavergne

releasing version 1.0.0-0ubuntu2

61. By Julien Lavergne

* debian/control:
 - Build-depends on xulrunner-1.9.2-dev until bug #724070 is fixed.

60. By Julien Lavergne

releasing version 1.0.0-0ubuntu1

59. By Julien Lavergne

releasing version 1.0.0-0ubuntu1

58. By Julien Lavergne

* debian/control:
 - Drop build-depends on quilt, handle by format 3.0.
* debian/patches/01_xulrunner-20.patch:
 - Drop, replace by upstream patch 91_svn421_disable_npp_initialize.patch.
* Drop unneeded symlinks in /usr/lib/xulrunner, /usr/lib/xulrunner-addons,
  /usr/lib/firefox, /usr/lib/iceweasel and /usr/lib/midbrowser
  - update debian/links
* Drop midbrowser dependency. This disappeared from Ubuntu a while ago
  - update debian/control
* Enable quilt and add patch to enable building with the latest NPAPI
  headers
  - update debian/control
  - update debian/rules
  - add debian/patches/01_xulrunner-20.patch
  - add debian/patches/series
* Don't use the Mozilla allocator by adding -DMOZ_NO_MOZALLOC to CXXFLAGS
  - update debian/rules

57. By Julien Lavergne

releasing version 1.0.0-0ubuntu1

56. By Julien Lavergne

Re-add .bzr-builddeb directory

55. By Julien Lavergne

   chromium (LP: #545209).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches