lp:~paulbrianstewart/ubuntu/oneiric/mplayer/829078-Spelling-Grammar-Fix

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu/oneiric/mplayer

Colin Watson: Disapprove on 2011-10-04

Barry Warsaw (community): Needs Information on 2011-09-01

Diff: 67 lines (+10/-12)

1 file modified

debian/control (+10/-12)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #829078: Spelling and Grammar Errors in Control file

Undecided

Won't Fix

Link a bug report

Related blueprints

78. By Paul Stewart on 2011-08-19

*Removed the libfaac-dev in the build-depends that I incorrectly copied from the medibuntu.natty control file

*Changed the uploaders and maintainer info back to what is in the ubuntu/mplayer control from

77. By Paul Stewart on 2011-08-19

*Changed the incorrect spelling of "usefule" to "useful"
*Changed incorrect spelling of "fullscreen" to "full-screen"
*Changed "abilities" to "capabilities"
*Changed "You only need these..." to "This package is required..."
*Changed instances of "mplayer" in the documentation text to a consistent "MPlayer" throughout

76. By Fabrice Coutadeur on 2011-03-26

No change upload for libx264-98 -> libx264-106 transition

75. By Reinhard Tartler on 2011-02-26

* Finish Merge from debian/unstable. Remaining changes:
  - Build depend on lame, x264, xvidcore and libbluray

74. By Angel Abad on 2011-02-07

* Merge from debian unstable. Remaining changes:
  - build depend against, lame, x264, xvid
* Dropped changes, applied upstream:
  - debian/patches/60eval-api.patch, backport patch from upstream to
    unbreak compilation for eval.h move not yet in 0.6

73. By Bhavani Shankar on 2010-12-24

No change rebuild against current libx264

72. By Reinhard Tartler on 2010-08-07

* merge from debian, remaining changes:
  - build depend against, lame, x264, xvid
* debian/patches/60eval-api.patch, backport patch from upstream to
  unbreak compilation for eval.h move not yet in 0.6
* gmplayer is gone now, please see smplayer as alternative frontend.
  LP: #503537, #493088, #467534, #467524, #460326, #390399, #285570,
      #208680, #118709, #513065, #459595, #455913, #179918, #65165.

71. By Reinhard Tartler on 2010-07-29

* merge from debian/experimental, remaining changes:
  - build depend against, lame, x264, xvid
  - enable mencoder and mplayer-gui
* ensure that quilt patches are actually applied

70. By Reinhard Tartler on 2010-06-03

readd x264, xvid and mp3lame support, LP: #606125

69. By Reinhard Tartler on 2010-06-03

remove old parallel building mechanism, fixes FTBFS