--- Begin Message ---
Package: mpc123
Version: 0.2.4-1.1+b1
Severity: normal
Tags: patch
Hi,
The NMU diff file for mpc123 is attached here.
Cheers,
Khalid.
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-2-686-pae (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages mpc123 depends on:
ii libao4 1.1.0-1.1+b1
ii libc6 2.13-31
ii libmpcdec6 2:0.1~r459-2
mpc123 recommends no packages.
mpc123 suggests no packages.
-- no debconf information
--
.''`. Khalid El Fathi <[email protected]>
: :' : GPG: 4096R/9368CAEC
`. `' www.elfathi.fr`
`-
diff -r mpc123-0.2.4/ao.c /home/invent/Dev/packaging/mpc123/mpc123-0.2.4/ao.c
147c147
< data->ao_dev=ao_open_file(ao_drvnum, options.foutput, MPC_TRUE, &ao_fmt, NULL);
---
> data->ao_dev=ao_open_file(ao_drvnum, options.foutput, TRUE, &ao_fmt, NULL);
149c149
<
---
>
178,180d177
< if(!bytes)
< return 0;
<
198,199c195
< sayf(0, "Out of memory (needed 0x%08x bytes)\n", bytes);
< return 0;
---
> dief(_("Out of memory (needed 0x%08x bytes)\n"), bytes);
diff -r mpc123-0.2.4/debian/changelog /home/invent/Dev/packaging/mpc123/mpc123-0.2.4/debian/changelog
0a1,33
> mpc123 (0.2.4-1.2) unstable; urgency=low
>
> [Khalid El Fathi]
> * Non-maintainer upload
> * debian/compat:
> + Update to 9
> * debian/control:
> + Build-Depends: Update to debhelper 9
> + Standards-Version: Update to 3.9.3.1
> + Add Homepage, Vcs-Git and Vcs-Browser fields
> * debian/copyright:
> + Update format to copyright-format 1.0 as released together with
> Debian policy 3.9.3.1.
> * Switch to dpkg-source 3.0 (quilt) format
> * Fixed lintian warnings and info tags
> + W: package-uses-deprecated-debhelper-compat-version 4
> + I: missing-debian-source-format
> + P: direct-changes-in-diff-but-no-patch-system ao.c and 3 more
> + W: debian-rules-missing-recommended-target build-arch
> + W: debian-rules-missing-recommended-target build-indep
> + W: ancient-standards-version 3.7.3 (current is 3.9.3)
> + I: debian-watch-file-is-missing
> + P: copyright-refers-to-symlink-license usr/share/common-licenses/GPL
> + P: no-homepage-field
> + I: hyphen-used-as-minus-sign usr/share/man/man1/mpc123.1.gz:12
> + I: spelling-error-in-manpage usr/share/man/man1/mpc123.1.gz deafult
> + I: hyphen-used-as-minus-sign usr/share/man/man1/mpc123.1.gz:50
> + I: hyphen-used-as-minus-sign usr/share/man/man1/mpc123.1.gz:69
> * Apply patch by Alex Chiang <[email protected]> to rearrange linker
> order to fix new DSO linking FTBFS (Closes: #641382).
>
> -- Khalid El Fathi <[email protected]> Wed, 02 May 2012 16:05:32 +0200
>
diff -r mpc123-0.2.4/debian/compat /home/invent/Dev/packaging/mpc123/mpc123-0.2.4/debian/compat
1c1
< 4
---
> 9
diff -r mpc123-0.2.4/debian/control /home/invent/Dev/packaging/mpc123/mpc123-0.2.4/debian/control
5,6c5,9
< Build-Depends: debhelper (>= 4.0.0), libmpcdec-dev (>= 2:0.1~r435), libao-dev, gettext
< Standards-Version: 3.7.3
---
> Build-Depends: debhelper (>= 9.0.0), libmpcdec-dev (>= 2:0.1~r435), libao-dev, gettext
> Standards-Version: 3.9.3.1
> Homepage: http://mpc123.sourceforge.net
> Vcs-Git: git://git.debian.org/collab-maint/mpc123.git
> Vcs-Browser: http://git.debian.org/?p=collab-maint/mpc123.git;a=summary
diff -r mpc123-0.2.4/debian/copyright /home/invent/Dev/packaging/mpc123/mpc123-0.2.4/debian/copyright
1,27c1,29
< This package was debianized by Daniele Sempione <[email protected]> on
< Thu, 12 Jan 2006 23:08:02 +0100
<
< It was downloaded from
< http://mpc123.sourceforge.net/dl.php
<
< Upstream author: Fernando Vezzosi <[email protected]>
<
< Copyright 2005, 2006 Fernando Vezzosi
<
< This program is free software; you can redistribute it and/or modify
< it under the terms of the GNU General Public License as published by
< the Free Software Foundation; either version 2 of the License, or
< (at your option) any later version.
<
< This program is distributed in the hope that it will be useful,
< but WITHOUT ANY WARRANTY; without even the implied warranty of
< MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
< GNU General Public License for more details.
<
< You should have received a copy of the GNU General Public License with
< the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
< if not, write to the Free Software Foundation, Inc., 51 Franklin St,
< Fifth Floor, Boston, MA 02110-1301, USA.
<
< On Debian systems, the complete text of the GNU General Public
< License, version 2, can be found in /usr/share/common-licenses/GPL-2.
---
> Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
> Upstream-Name: mpc123
> Upstream-Contact: Fernando Vezzosi <[email protected]>
> Source: http://mpc123.sourceforge.net
>
> Files: *
> Copyright: © 2005 Fernando Vezzosi <[email protected]>
> License: GPL-2.0+
>
> Files: debian/*
> Copyright: © 2006 Daniele Sempione <[email protected]>
> License: GPL-2.0+
>
> License: GPL-2.0+
> This package is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> the Free Software Foundation; either version 2 of the License, or
> (at your option) any later version.
> .
> This package is distributed in the hope that it will be useful,
> but WITHOUT ANY WARRANTY; without even the implied warranty of
> MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> GNU General Public License for more details.
> .
> You should have received a copy of the GNU General Public License
> along with this program. If not, see <http://www.gnu.org/licenses/>
> .
> On Debian systems, the complete text of the GNU General
> Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
Only in /home/invent/Dev/packaging/mpc123/mpc123-0.2.4/debian: patches
diff -r mpc123-0.2.4/debian/rules /home/invent/Dev/packaging/mpc123/mpc123-0.2.4/debian/rules
16a17,19
> build: build-arch build-indep
> build-arch: build-stamp
> build-indep: build-stamp
39c42
< dh_clean -k
---
> dh_prep
Only in /home/invent/Dev/packaging/mpc123/mpc123-0.2.4/debian: source
Only in /home/invent/Dev/packaging/mpc123/mpc123-0.2.4/debian: watch
Only in /home/invent/Dev/packaging/mpc123/mpc123-0.2.4/: .git
diff -r mpc123-0.2.4/mpc123.h /home/invent/Dev/packaging/mpc123/mpc123-0.2.4/mpc123.h
32,34c32,33
< # include <mpc/mpcdec.h>
< # include <mpc/streaminfo.h>
< # include <mpc/mpc_types.h>
---
> # include <mpcdec/config_types.h>
> # include <mpcdec/mpcdec.h>
48c47
< # define VERS_REV 5
---
> # define VERS_REV 4
diff -r mpc123-0.2.4/player.c /home/invent/Dev/packaging/mpc123/mpc123-0.2.4/player.c
34,36c34,36
< mpc_demux *mpc123_decoder = NULL;
< mpc_frame_info frame;
< mpc_status err;
---
> mpc_decoder mpc123_decoder;
> mpc_int32_t mpc_ret;
> mpc_uint32_t vbrAcc=0, vbrUpd=0;
47,48c47,50
< mpc123_decoder = mpc_demux_init(the_reader);
< if( !mpc123_decoder ){
---
> mpc_streaminfo_init(&tmp_stream_info);
> if( (mpc_ret=mpc_streaminfo_read(&tmp_stream_info, the_reader))
> != ERROR_CODE_OK){
> debugf("mpc_streaminfo_read()=%d", mpc_ret);
52c54,59
< mpc_demux_get_info(mpc123_decoder, &tmp_stream_info);
---
> /* initialize decoder with the appropriate file reader */
> mpc_decoder_setup(&mpc123_decoder, the_reader);
> if( !(mpc_ret=mpc_decoder_initialize(&mpc123_decoder, &tmp_stream_info)) ){
> debugf("mpc_decoder_initialize()=%d", mpc_ret);
> die("Error initializing decoder\n");
> }
60,61c67,68
< frame.buffer = buffer;
< err = mpc_demux_decode(mpc123_decoder, &frame);
---
> decoded_samples=mpc_decoder_decode(&mpc123_decoder, buffer,
> &vbrAcc, &vbrUpd);
63c70
< if( err != MPC_STATUS_OK ){ /* eof */
---
> if( !decoded_samples ){ /* eof */
68c75
< if( err == -1 ){ /* decoding error */
---
> if( decoded_samples == -1 ){ /* decoding error */
74c81
< decoded_samples = frame.samples;
---
> /* debug(" <%d %d %d>", vbrAcc, vbrUpd, vbrUpd * 44100 / 1152 / 100);*/
diff -r mpc123-0.2.4/reader_file.c /home/invent/Dev/packaging/mpc123/mpc123-0.2.4/reader_file.c
24a25,27
> #include <mpcdec/config_types.h>
> #include <mpcdec/mpcdec.h>
>
26,27c29,30
< static mpc_int32_t mpc123_file_read(mpc_reader *t, void *ptr, mpc_int32_t size){
< reader_data *data=(reader_data*) t->data;
---
> static mpc_int32_t mpc123_file_read(void *t, void *ptr, mpc_int32_t size){
> reader_data *data=(reader_data*) t;
32,33c35,36
< static mpc_bool_t mpc123_file_seek(mpc_reader *t, mpc_int32_t offset){
< reader_data *data=(reader_data*) t->data;
---
> static mpc_bool_t mpc123_file_seek(void *t, mpc_int32_t offset){
> reader_data *data=(reader_data*) t;
35c38
< return MPC_TRUE;
---
> return TRUE;
38,39c41,42
< static mpc_int32_t mpc123_file_tell(mpc_reader *t){
< reader_data *data=(reader_data*) t->data;
---
> static mpc_int32_t mpc123_file_tell(void *t){
> reader_data *data=(reader_data*) t;
44,45c47,48
< static mpc_int32_t mpc123_file_get_size(mpc_reader *t){
< reader_data *data=(reader_data*) t->data;
---
> static mpc_int32_t mpc123_file_get_size(void *t){
> reader_data *data=(reader_data*) t;
56,57c59,60
< static mpc_bool_t mpc123_file_canseek(mpc_reader *t){
< return MPC_TRUE;
---
> static mpc_bool_t mpc123_file_canseek(void *t){
> return TRUE;
65,70c68,73
< .read = mpc123_file_read,
< .seek = mpc123_file_seek,
< .tell = mpc123_file_tell,
< .get_size = mpc123_file_get_size,
< .canseek = mpc123_file_canseek,
< .data = NULL /* reader_data * data */
---
> .read=mpc123_file_read,
> .seek=mpc123_file_seek,
> .tell=mpc123_file_tell,
> .get_size=mpc123_file_get_size,
> .canseek=mpc123_file_canseek,
> .data=NULL /* reader_data * data */
--- End Message ---
signature.asc
