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

[Paul Stewart]

*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

*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

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

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

[Barry Warsaw (barry)]

Hi Paul, thanks for you contribution to Ubuntu.

The only change I'm not so sure about is fullscreen -> full-screen. I think it should probably be written "full screen" without the hyphen.

Also, it would probably be best to submit this bug report and patch to Debian, and then let us sync it to Ubuntu, rather than carry an Ubuntu-specific delta. Would you be willing to do that?

review: Needs Information

[Paul Stewart (paulbrianstewart)]

Hi Barry,

Sure, I'll send up a bug report to Debian. The problem is I can't seem to get it to work. I am using the following commands:

paul@pl:~$ reportbug -B mplayer
Ignored bogus setting for -B: mplayer
*** ERROR: "Ubuntu" BTS is currently unsupported. Please use "ubuntu-bug" (from
the apport package) for reporting bugs in Ubuntu. You can report bugs to Debian
by specifying 'bts debian' in your ~/.reportbugrc or by passing the -B debian
option on the commandline (see reportbug(1)).

What am I doing wrong? Are you able to advise me please?

Thanks
Paul

[Paul Stewart (paulbrianstewart)]

> Hi Paul, thanks for you contribution to Ubuntu.
>
> The only change I'm not so sure about is fullscreen -> full-screen. I think
> it should probably be written "full screen" without the hyphen.
>
> Also, it would probably be best to submit this bug report and patch to Debian,
> and then let us sync it to Ubuntu, rather than carry an Ubuntu-specific delta.
> Would you be willing to do that?

Hi Barry,

I have submitted the bug and code up to debianbugs http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=641675

Please let me know if I need to do anything else.

Thanks
Paul Stewart

[Colin Watson (cjwatson)]

That's fine, thanks. There's no need for us to carry this separately, then; spelling/grammar tweaks like this should almost always be submitted to Debian and synced/merged into Ubuntu rather than going directly through our sponsorship queue.

review: Disapprove

Unmerged revisions

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

=== modified file 'debian/control'
--- debian/control	2011-02-26 14:37:59 +0000
+++ debian/control	2011-08-19 18:44:26 +0000
@@ -3,9 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian multimedia packages maintainers <[e-mail]>
-Uploaders: A Mennucc1 <[e-mail]>,
-           Reinhard Tartler <[e-mail]>,
-           Andres Mejia <[e-mail]>
+Uploaders: A Mennucc1 <[e-mail]>, Reinhard Tartler <[e-mail]>, Andres Mejia <[e-mail]>
 DM-Upload-Allowed: yes
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/mplayer.git
@@ -97,11 +95,11 @@
  DirectFB, but also SDL (plus all its drivers) and some
  low level card-specific drivers (for Matrox, 3Dfx and Radeon, Mach64
  and Permedia3). Most of them support software or hardware scaling,
- therefore allowing fullscreen display.  MPlayer is also able
+ therefore allowing full-screen display.  MPlayer is also able
  to use some hardware MPEG decoder boards, such as the DVB
  and DXR3/Hollywood+.
  .
- This package includes the gui variant of mplayer.
+ This package includes the GUI variant of MPlayer.
 
 Package: mencoder
 Architecture: any
@@ -122,8 +120,8 @@
  encode MPlayer-playable movies
  (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET) to other
  MPlayer-playable formats. It can encode with various codecs, like DivX4
- (1 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream
- copying and video resizing abilities.
+ (1 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. MPlayer also has stream
+ copying and video resizing capabilities.
 
 Package: mplayer
 Architecture: any
@@ -148,7 +146,7 @@
  DirectFB, but also SDL (plus all its drivers) and some
  low level card-specific drivers (for Matrox, 3Dfx and Radeon, Mach64
  and Permedia3). Most of them support software or hardware scaling,
- therefore allowing fullscreen display.  MPlayer is also able
+ therefore allowing full-screen display.  MPlayer is also able
  to use some hardware MPEG decoder boards, such as the DVB
  and DXR3/Hollywood+.
  .
@@ -166,8 +164,8 @@
  This package contains the debugging symbols for MPlayer, a movie
  player for Unix-like systems.
  .
- You only need these if you want to generate usefule debugging
- backtraces.
+ This package is required if you want to generate useful debugging
+ back-traces.
 
 Package: mplayer-doc
 Architecture: all
@@ -179,5 +177,5 @@
  This package contains the HTML documentation for MPlayer, a movie player for
  Unix-like systems. It is available in several languages.
  .
- You only need this package if you want to read the mplayer manual. The manpages
- are included in the regular mplayer package.
+ This package is required if you want to read the MPlayer manual. The manpages
+ are included in the regular MPlayer package.