Merge lp://qastaging/~noskcaj/ubuntu/saucy/gecko-mediaplayer/1.0.8-4u1 into lp://qastaging/ubuntu/saucy/gecko-mediaplayer

Proposed by Jackson Doak
Status: Needs review
Proposed branch: lp://qastaging/~noskcaj/ubuntu/saucy/gecko-mediaplayer/1.0.8-4u1
Merge into: lp://qastaging/ubuntu/saucy/gecko-mediaplayer
Diff against target: 600 lines (+70/-463)
9 files modified
.pc/0001-nomozalloc.patch/configure.in (+0/-228)
.pc/0002-require-nspr.patch/configure.in (+0/-228)
.pc/applied-patches (+0/-2)
configure.in (+2/-3)
debian/changelog (+33/-0)
debian/gbp.conf (+1/-1)
debian/install (+0/-1)
debian/patches/functable-check.patch (+33/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp://qastaging/~noskcaj/ubuntu/saucy/gecko-mediaplayer/1.0.8-4u1
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+183036@code.qastaging.launchpad.net

Description of the change

Merge from debian testing, closes 2 of 3 complete bugs, maybe all of them

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve

Unmerged revisions

32. By Jackson Doak

* Merge from Debian testing, remaining ubuntu changes:
  - debian/rules: Drop --with-xulrunner-sdk flag, it's empty and cause FTBFS.
  - debian/control: Build depend on libnspr4-dev
  - debian/patches/0002-require-nspr.patch:
    firefox-dev now only provides npapi headers so require nspr to build

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

to all changes: