lp:~ubuntu-branches/ubuntu/natty/gst-plugins-bad0.10/natty-201103311110

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu/natty/gst-plugins-bad0.10

Colin Watson: Disapprove on 2011-04-05

Diff: 197 lines (+185/-0) (has conflicts)

2 files modified

debian/patches/0001-fpsdisplaysink-add-properties-to-get-dropped-and-ren.patch (+142/-0)
debian/patches/fpsdisplaysink_sync_default_value.patch (+43/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

60. By Steve Langasek on 2011-03-31

merge from Kunal

59. By Ken VanDine on 2011-03-22

* debian/control.in
  - Use a Breaks and Replace instead of Conflicts and Replace (LP: #739551)
  - Added a Breaks and Replace for the -dbg package as well

58. By Ken VanDine on 2011-03-21

* debian/control.in
  - Dropped Breaks and made sure to Conflict and Replace -good (LP: #739551)

57. By Ken VanDine on 2011-03-17

* debian/gstreamer-plugins-bad.install
  - Don't include the shm plugin, we've moved that to -good (LP: #739351)
* debian/control.in
  - Change the conflicts to a breaks for
    gstreamer0.10-plugins-good << 0.10.28-0ubuntu2

56. By Brian Thomason on 2011-03-14

Removed Conflicts/Replaces/Provides for gstreamer0.10-fluendo-mpegdemux as
thee packages can now co-exist, and the Conflict prevented certain codec
packs provided directly by Fluendo from being installed. (LP: #731711)

55. By Sebastian Dröge on 2011-03-07

* debian/patches/01_soundtouch-pc.patch:
  + And the pkg-config file is called soundtouch.pc nowadays.

54. By Sebastian Dröge on 2011-03-07

* debian/build-deps.in:
  + It's libsoundtouch-dev, not libsoundtouch0-dev.

53. By Sebastian Dröge on 2011-03-07

* Merge with Debian; remaining changes.
  - Remove plugins that are now provided -good in
    debian/gstreamer-plugins-bad.install:
    - libgstautoconvert.so
    - libgstdtmf.so
    - libgstliveadder.so
    - libgstrtpmux.so
  - Revert enabling of libgstlv2 -- drop lv2core, libslv2-dev from
    debian/build-deps.in and remove libgstlv2 from
    debian/gstreamer-plugins-bad.install. This plugin segfaults on amd64
    and is too unstable for now. the bug requesting this was LP #511334 and
    the instability statement is at LP #513347.

52. By Benjamin Drung on 2011-01-30

Rebuild against the newest soundtouch.

51. By Laurent Bigonville on 2011-01-23

* Merge with Debian; remaining changes. (LP: #705414)
  - Remove plugins that are now provided -good in
    debian/gstreamer-plugins-bad.install:
    - libgstautoconvert.so
    - libgstdtmf.so
    - libgstliveadder.so
    - libgstrtpmux.so
  - Revert enabling of libgstlv2 -- drop lv2core, libslv2-dev from
    debian/build-deps.in and remove libgstlv2 from
    debian/gstreamer-plugins-bad.install. This plugin segfaults on amd64
    and is too unstable for now. the bug requesting this was LP #511334 and
    the instability statement is at LP #513347.