Merge lp:~kamalmostafa/ubuntu/lucid/mpd/fix-511454-ftbfs into lp:ubuntu/lucid/mpd

Proposed by Kamal Mostafa on 2010-01-23
Status: Merged
Merged at revision: not available
Proposed branch: lp:~kamalmostafa/ubuntu/lucid/mpd/fix-511454-ftbfs
Merge into: lp:ubuntu/lucid/mpd
Diff against target: 29 lines (+10/-1)
2 files modified
debian/changelog (+9/-0)
src/decoder/wavpack_plugin.c (+1/-1)
To merge this branch: bzr merge lp:~kamalmostafa/ubuntu/lucid/mpd/fix-511454-ftbfs
Reviewer Review Type Date Requested Status
Iulian Udrea Approve on 2010-01-23
Ubuntu branches 2010-01-23 Pending
Review via email: mp+17937@code.launchpad.net
To post a comment you must log in.
Iulian Udrea (iulian) wrote :

Looks good.

review: Approve

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 2010-01-19 21:31:01 +0000
3+++ debian/changelog 2010-01-23 03:25:19 +0000
4@@ -1,3 +1,12 @@
5+mpd (0.15.4-1ubuntu3) lucid; urgency=low
6+
7+ * Apply patch from upstream to fix Lucid FTBFS (LP#: 511454).
8+ - [ Max Kellermann<max@duempel.org> ]
9+ decoder/wavpack: don't use the nonstandard "uchar" type
10+ Use the signed C99 type int8_t instead.
11+
12+ -- Kamal Mostafa <kamal@whence.com> Fri, 22 Jan 2010 18:46:40 -0800
13+
14 mpd (0.15.4-1ubuntu2) lucid; urgency=low
15
16 * rebuild for ffmpeg versioned symbols
17
18=== modified file 'src/decoder/wavpack_plugin.c'
19--- src/decoder/wavpack_plugin.c 2009-05-07 15:08:43 +0000
20+++ src/decoder/wavpack_plugin.c 2010-01-23 03:25:19 +0000
21@@ -72,7 +72,7 @@
22
23 switch (bytes_per_sample) {
24 case 1: {
25- uchar *dst = buffer;
26+ int8_t *dst = buffer;
27 /*
28 * The asserts like the following one are because we do the
29 * formatting of samples within a single buffer. The size

Subscribers

People subscribed via source and target branches

to all changes: