Merge lp:~cldunlap1/ubuntu/oneiric/xine-lib/fix-for-835437 into lp:ubuntu/oneiric/xine-lib

Proposed by Chad Dunlap
Status: Rejected
Rejected by: Martin Pitt
Proposed branch: lp:~cldunlap1/ubuntu/oneiric/xine-lib/fix-for-835437
Merge into: lp:ubuntu/oneiric/xine-lib
Diff against target: 57 lines (+14/-3)
4 files modified
debian/changelog (+11/-0)
src/post/audio/stretch.c (+1/-1)
src/post/deinterlace/xine_plugin.c (+1/-1)
src/video_out/video_out_pgx64.c (+1/-1)
To merge this branch: bzr merge lp:~cldunlap1/ubuntu/oneiric/xine-lib/fix-for-835437
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Needs Fixing
Ubuntu branches Pending
Review via email: mp+78137@code.launchpad.net

Description of the change

made the spelling changes requested in lp: #835437 but forgot to do the merge proposal. Sorry all.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Thanks Chad about this fixes and attention to detail. It's small improvment like that which makes ubuntu better! :-)

However, I need to disapprove that change for now:
- all changes are done inline, you need rather to use a patch system like quilt (which is already used in the package): https://wiki.ubuntu.com/PackagingGuide/Howtos/Quilt
- this change clearly need to be done upstream to benefit all users of xine and not just ubuntu one. Can you please upstream this? If you need more help on how to do that, do not hesitate to ping me on irc (didrocks)!

review: Needs Fixing
Revision history for this message
Chad Dunlap (cldunlap1) wrote :

On Friday, October 07, 2011 05:26:31 AM you wrote:
> Review: Needs Fixing
>
> Thanks Chad about this fixes and attention to detail. It's small improvment
> like that which makes ubuntu better! :-)
>
> However, I need to disapprove that change for now:
> - all changes are done inline, you need rather to use a patch system like
> quilt (which is already used in the package):
> https://wiki.ubuntu.com/PackagingGuide/Howtos/Quilt - this change clearly
> need to be done upstream to benefit all users of xine and not just ubuntu
> one. Can you please upstream this? If you need more help on how to do
> that, do not hesitate to ping me on irc (didrocks)!

I have made the changes per your request and uploaded them. I am going to
try and figure out how to push this upstream now.

Thank you for pointing out the errors, it was quite the learning experience.

--

Thank You,
Chad Dunlap

Revision history for this message
Chad Dunlap (cldunlap1) wrote :

On Friday, October 07, 2011 05:26:31 AM you wrote:
> Review: Needs Fixing
>
> Thanks Chad about this fixes and attention to detail. It's small improvment
> like that which makes ubuntu better! :-)
>
> However, I need to disapprove that change for now:
> - all changes are done inline, you need rather to use a patch system like
> quilt (which is already used in the package):
> https://wiki.ubuntu.com/PackagingGuide/Howtos/Quilt - this change clearly
> need to be done upstream to benefit all users of xine and not just ubuntu
> one. Can you please upstream this? If you need more help on how to do
> that, do not hesitate to ping me on irc (didrocks)!

here is the link, I think, you wanted for the upstream bug report.

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=644927

If it isn't, please let me know.
--

Thank You,
Chad Dunlap

Revision history for this message
Martin Pitt (pitti) wrote :

Thanks Chad. Your fixes were applied upstream, so they will trickle into Ubuntu with the next version. I don't think it's worth making a separate upload for those (also, this needs to be quilt-ified, etc.).

Unmerged revisions

88. By Chad Dunlap <email address hidden>

Fixed three spelling errors (LP#835437) .
src/post/audio/stretch.c:267 -- 'originaly' to 'originally'
src/post/deinterlace/xine-plugin.c:211 -- 'plataforms' to 'platforms'
src/video_out/video_out_pgx64.c:840 -- 'suffucient' to 'sufficient'

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-05-27 20:06:13 +0000
3+++ debian/changelog 2011-10-04 18:21:29 +0000
4@@ -1,3 +1,14 @@
5+xine-lib (1.1.19-2ubuntu7) natty; urgency=low
6+
7+ * Fixed three spelling errors (LP#835437) .
8+ * src/post/audio/stretch.c:267 -- 'originaly' to 'originally'
9+ * src/post/deinterlace/xine-plugin.c:211 -- 'plataforms' to
10+'platforms'
11+ * src/video_out/video_out_pgx64.c:840 -- 'suffucient' to
12+'sufficient'
13+
14+ -- Chad Dunlap <cldunlap@BA120470> Sun, 11 Sep 2011 01:36:59 -0400
15+
16 xine-lib (1.1.19-2ubuntu6) oneiric; urgency=low
17
18 * Tighten dependencies on Libav 0.7
19
20=== modified file 'src/post/audio/stretch.c'
21--- src/post/audio/stretch.c 2010-01-26 15:11:07 +0000
22+++ src/post/audio/stretch.c 2011-10-04 18:21:29 +0000
23@@ -267,7 +267,7 @@
24 return _("This filter will perform a time stretch, playing the "
25 "stream faster or slower by a factor. Pitch is optionally "
26 "preserved, so it is possible, for example, to use it to "
27- "watch a movie in less time than it was originaly shot.\n"
28+ "watch a movie in less time than it was originally shot.\n"
29 );
30 }
31
32
33=== modified file 'src/post/deinterlace/xine_plugin.c'
34--- src/post/deinterlace/xine_plugin.c 2010-01-26 15:11:07 +0000
35+++ src/post/deinterlace/xine_plugin.c 2011-10-04 18:21:29 +0000
36@@ -259,7 +259,7 @@
37 "and cpu usage.\n"
38 "\n"
39 "* Uses several algorithms from tvtime and dscaler projects.\n"
40- "Deinterlacing methods: (Not all methods are available for all plataforms)\n"
41+ "Deinterlacing methods: (Not all methods are available for all platforms)\n"
42 "\n"
43 );
44 }
45
46=== modified file 'src/video_out/video_out_pgx64.c'
47--- src/video_out/video_out_pgx64.c 2010-01-26 15:11:07 +0000
48+++ src/video_out/video_out_pgx64.c 2011-10-04 18:21:29 +0000
49@@ -837,7 +837,7 @@
50 if (this->buf_mode == BUF_MODE_MULTI_FAILED) {
51 for (i=0; i<frame->planes; i++) {
52 if ((this->buffers[0][i] = vram_alloc(this, frame->lengths[i])) < 0) {
53- xprintf(this->class->xine, XINE_VERBOSITY_LOG, _("video_out_pgx64: Error: insuffucient video memory\n"));
54+ xprintf(this->class->xine, XINE_VERBOSITY_LOG, _("video_out_pgx64: Error: insiffucient video memory\n"));
55 if (this->current != NULL) {
56 this->current->vo_frame.free(&this->current->vo_frame);
57 this->current = NULL;

Subscribers

People subscribed via source and target branches

to all changes: