--- mpg123-1.12.1.orig/configure.ac +++ mpg123-1.12.1/configure.ac @@ -13,7 +13,7 @@ AC_INIT([mpg123], [1.12.1], [mpg123-devel@lists.sourceforge.net]) dnl Increment API_VERSION when the API gets changes (new functions). API_VERSION=25 -LIB_PATCHLEVEL=0 +LIB_PATCHLEVEL=1 dnl Since we want to be backwards compatible, both sides get set to API_VERSION. LIBMPG123_VERSION=$API_VERSION:$LIB_PATCHLEVEL:$API_VERSION AC_SUBST(LIBMPG123_VERSION) @@ -889,6 +889,7 @@ # Using the lower level macros instead of AC_TYPE_* for compatibility with not freshest autoconf. AC_CHECK_TYPE(size_t, unsigned long) +AC_CHECK_TYPE(uintptr_t, unsigned long) AC_CHECK_TYPE(ssize_t, long) AC_CHECK_TYPE(off_t, long int) AC_CHECK_TYPE(int32_t, int) --- mpg123-1.12.1.orig/src/libmpg123/frame.c +++ mpg123-1.12.1/src/libmpg123/frame.c @@ -1,7 +1,7 @@ /* frame: Heap of routines dealing with the core mpg123 data structure. - copyright 2008-9 by the mpg123 project - free software under the terms of the LGPL 2.1 + copyright 2008-2010 by the mpg123 project - free software under the terms of the LGPL 2.1 see COPYING and AUTHORS files in distribution or http://mpg123.org initially written by Thomas Orgis */ @@ -14,10 +14,25 @@ /* that's doubled in decode_ntom.c */ #define NTOM_MUL (32768) -#define aligned_pointer(p,type,alignment) \ - (((char*)(p)-(char*)NULL) % (alignment)) \ - ? (type*)((char*)(p) + (alignment) - (((char*)(p)-(char*)NULL) % (alignment))) \ - : (type*)(p) + +#define aligned_pointer(p, type, alignment) align_the_pointer(p, alignment) +void *align_the_pointer(void *base, unsigned int alignment) +{ + /* + Work in unsigned integer realm, explicitly. + Tricking the compiler into integer operations like % by invoking base-NULL is dangerous: It results into ptrdiff_t, which gets negative on big addresses. Big screw up, that. + I try to do it "properly" here: Casting only to uintptr_t and no artihmethic with void*. + */ + uintptr_t baseval = (uintptr_t)(char*)base; + uintptr_t aoff = baseval % alignment; + + debug3("align_the_pointer: pointer %p is off by %u from %u", + base, (unsigned int)aoff, alignment); + + if(aoff) return (char*)base+alignment-aoff; + else return base; +} + void frame_default_pars(mpg123_pars *mp) { mp->outscale = 1.0; --- mpg123-1.12.1.orig/src/libmpg123/dither.h +++ mpg123-1.12.1/src/libmpg123/dither.h @@ -17,7 +17,9 @@ ,mpg123_highpass_tpdf_noise }; +#if 0 void mpg123_noise(float* table, size_t count, enum mpg123_noise_type noisetype); +#endif void dither_table_init(float *dithertable); #endif --- mpg123-1.12.1.orig/src/libmpg123/dither.c +++ mpg123-1.12.1/src/libmpg123/dither.c @@ -100,6 +100,7 @@ } } +#if 0 void mpg123_noise(float* table, size_t count, enum mpg123_noise_type noisetype) { switch(noisetype) @@ -111,6 +112,7 @@ break; } } +#endif /* Generate white noise and shape it with a high pass filter. */ void dither_table_init(float *dithertable) --- mpg123-1.12.1.orig/debian/changelog +++ mpg123-1.12.1/debian/changelog @@ -0,0 +1,815 @@ +mpg123 (1.12.1-2ubuntu1) maverick; urgency=low + + * Merge from debian unstable (LP: #607215). Remaining changes: + - debian/control: Remove libartsc0-dev from build depends. + + -- Angel Abad Tue, 15 Jun 2010 07:32:48 +0100 + +mpg123 (1.12.1-2) unstable; urgency=low + + * configure.ac, src/libmpg123/frame.c: Apply backport of upstream patch + to fix calculation of pointer alignment on 32bit archs. Many thanks + to William Pitcock, Gregor Herrmann, and upstream author Thomas Orgis + for tracking down this problem. Closes: #580095 + * debian/rules: Run autoreconf to rebuild configure script after + having applied above patch. In clean target, remove any files + altered by autoreconf. + * debian/control: Build-depend on automake and autoconf for autoreconf. + + -- Daniel Kobras Wed, 09 Jun 2010 21:40:23 +0200 + +mpg123 (1.12.1-1) unstable; urgency=low + + * New upstream version. Closes: #572975 + * debian/control: Package complies with version 3.8.4 of Debian policy. + * debian/control: Add substitution variable misc:Depends to package + dependency lines to placate lintian. + * debian/libmpg123-0.symbols.common.in: Add new symbols mpg123_open_handle + and mpg123_replace_reader_handle. + + -- Daniel Kobras Wed, 28 Apr 2010 21:18:28 +0200 + +mpg123 (1.12.1-0ubuntu1) lucid; urgency=low + + * New upstream release + * Direct request from upstream for compatibility purposes + * Also unifies the large/small file support issues we had earlier + + -- Scott Ritchie Wed, 31 Mar 2010 14:56:30 -0700 + +mpg123 (1.10.1~prerelease2-0ubuntu1) lucid; urgency=low + + * New upstream release + * Use prerelease to fix a Wine build failure (LP: #522916) + + -- Scott Ritchie Tue, 16 Feb 2010 13:56:34 -0800 + +mpg123 (1.10.0-2ubuntu1) lucid; urgency=low + + * Merge from Debian unstable, remaining change: + - debian/control: Remove libartsc0-dev from build depends. + + -- Daniel T Chen Mon, 21 Dec 2009 00:11:29 -0500 + +mpg123 (1.10.0-2) unstable; urgency=low + + * src/libmpg123/dither.[hc]: Disable function mpg123_noise that is not + yet part of libmpg123's official API and should therefore not get + exported. + * debian/libmpg123-0.symbols.common.in: Remove symbol mpg123_noise + accordingly. Closes: #559892 + + -- Daniel Kobras Thu, 10 Dec 2009 20:42:32 +0100 + +mpg123 (1.10.0-1) unstable; urgency=low + + * New upstream release 1.10.0. + * debian/libmpg123-0.symbols.common.in: Add four new symbols. + * debian/libmpg123-0.symbols.{32bit,64bit}.in: Add one new\ + architecture-dependent symbol. + * debian/control: Complies with version 3.8.3 of Debian policy. + + -- Daniel Kobras Sun, 06 Dec 2009 23:13:36 +0100 + +mpg123 (1.9.1-2ubuntu1) lucid; urgency=low + + * Merge from Debian testing, remaining changes: + - debian/control: Remove libartsc0-dev from build depends. + * ChangeLog,NEWS,configure.ac,mpg123.spec,src/libmpg123/libmpg123.c: + - Drop all Ubuntu deltas that were just informational and are no + longer relevant + + Regenerate configure + + -- Daniel T Chen Fri, 06 Nov 2009 03:27:47 +0000 + +mpg123 (1.9.1-2) unstable; urgency=low + + * debian/rules: Disable PIE on mips/mipsel due to binutils bug #532821. + Works around build failures on these archs. + * debian/rules: Include contents of config.log in build log if + configure fails. + + -- Daniel Kobras Mon, 19 Oct 2009 22:51:48 +0200 + +mpg123 (1.9.1-1) unstable; urgency=low + + * New upstream version 1.9.1. + * src/output/arts.c: Drop Debian-specific 64bit patch (fixed upstream). + * debian/libmpg123-0.symbols.common.in: Add two new exported library + symbols. + + -- Daniel Kobras Wed, 14 Oct 2009 21:43:18 +0200 + +mpg123 (1.7.3-0ubuntu1) karmic; urgency=low + + * New upstream release + - Includes a fix for a regression in forward seeking + + -- Scott Ritchie Mon, 14 Sep 2009 04:58:49 -0700 + +mpg123 (1.7.2-3ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - Remove arts from dependencies + + -- César Muñoz Albitres Sun, 03 May 2009 17:55:27 -0500 + +mpg123 (1.7.2-3) unstable; urgency=low + + * debian/alt_deps.py: Add helper code to fold several (plugin) + dependencies into a single alternative dependency. Used to + auto-generate the default Recommends for "first-class" output + plugins. Unlike the previous hack in debian/rules, the helper + tool can handle several dependency entries per plugin. Fixes + build errors on several archs where plugins picked out a different + versioned dependency on libc6 than the rest of the packages. + Closes: #524246 + * debian/control: Add build-dependency on python-minimal for + helper tool. + * debian/rules: Remove previous hack to generate plugin:Recommends + and use helper tool instead. + + -- Daniel Kobras Sat, 18 Apr 2009 22:34:51 +0200 + +mpg123 (1.7.2-2) unstable; urgency=low + + * debian/libmpg123-0.symbols*: Distinguish between symbols on 32bit + and 64bit platforms. Closes: #523592 + + -- Daniel Kobras Wed, 15 Apr 2009 20:16:05 +0200 + +mpg123 (1.7.2-1) unstable; urgency=low + + * New upstream version 1.7.2. + + Fixes a denial-of-service vulnerability in the ID3 decoder. (No + CVE-ID listed so far.) + * debian/control: Package complies with version 3.8.1 of Debian policy. + * debian/libmpg123-0.symbols: Add initial symbols file. + * debian/rules: Make use of improved security features in gcc and ld, + unless DEB_BUILD_OPTIONS contain the "noharden" keyword. + + -- Daniel Kobras Thu, 09 Apr 2009 20:43:35 +0200 + +mpg123 (1.6.4-1) unstable; urgency=low + + * New upstream version 1.6.4. + + Misleading commandline option --resync has been renamed to + --no-resync. Closes: #493590 + * src/output/arts.c: Fix invalid cast on 64bit archs. + * Upload to unstable again. Closes: #500719 + + -- Daniel Kobras Thu, 26 Mar 2009 17:33:48 +0100 + +mpg123 (1.6.2-1) experimental; urgency=low + + * New upstream version 1.6.2. + + Includes WAV and ID3 fixes previously applied as Debian-specific + patches. + * debian/rules: Several new symbols have been added to libmpg123-0. + Bump shlibs version. + + -- Daniel Kobras Sat, 20 Dec 2008 17:35:17 +0100 + +mpg123 (1.4.3-4ubuntu1) jaunty; urgency=low + + * Remove arts from dependencies. (LP: #320915) + - debian/control: Remove libartsc0-dev from build depends. + + -- Andreas Wenning Thu, 29 Jan 2009 19:55:44 +0100 + +mpg123 (1.4.3-4) unstable; urgency=medium + + * src/wav.c: Backport upstream patch for writing WAV output to stdout + via '-w -'. Fixes regression from etch. Closes: #493285 + * debian/rules: Only include ALSA dependencies when respective plugin has + been built. Original patch thanks to Petr Salinger. Fixes build failure + on GNU/kFreeBSD. Closes: #493423 + + -- Daniel Kobras Sun, 07 Sep 2008 17:02:54 +0200 + +mpg123 (1.4.3-3) unstable; urgency=medium + + * src/libmpg123/id3.c: Apply upstream fix for out-of-bounds error in + id3 parser. + * debian/mpg123.postinst: Output auto-detection is no good as long as + output-specific wrappers are still listed as alternatives with higher + priority. Remove alternative setting for all wrapper scripts, therefore. + Closes: #391669 + * debian/mpg123-wrapper.in: Call mpg123 binary with exec to avoid stray + shell process as suggested by Shane Wegner. + + -- Daniel Kobras Sun, 06 Jul 2008 18:46:38 +0200 + +mpg123 (1.4.3-2) unstable; urgency=medium + + * debian/control: Add build-dependency on libltdl-dev to fix build + failures. + * debian/control: Include build-dependencies for arts, jack, and + pulseaudio output plugins. + + -- Daniel Kobras Sat, 21 Jun 2008 18:07:34 +0200 + +mpg123 (1.4.3-1) unstable; urgency=low + + * New upstream version. Closes: #469110 + + Core engine provided as a library now. Closes: #52020 + + Different audio output systems can now be selected at runtime via a + plugin mechanism. + + Fixed parsing of ICY streams. Closes: #449319 + * debian/*: Major packaging overhaul. + + Output-specific packages are turned into dummy packages as plugins in + the main package mpg123 now provide all the required funtionality. + + In a default installation, dependencies for the ALSA and OSS output + plugins are pulled in via Recommends. Dependencies for the other + output plugins are provided in Suggests. Closes: #391669 + + A package with i486-specific optimisations is no longer built. Instead, + a dummy package will pull in the main package mpg123 providing generic + optimisations. + + As different output backends and CPU optimisations used to be accessible + through separate binaries, wrapper skripts are provided using the old + names. These wrappers are likely to be removed in the next release + cycle, though. + + -- Daniel Kobras Sun, 15 Jun 2008 19:18:58 +0200 + +mpg123 (1.1.0-1) unstable; urgency=low + + * New upstream version. + + Includes support for delay option. Dropped Debian-specific changes. + + -- Daniel Kobras Wed, 16 Jan 2008 20:20:13 +0100 + +mpg123 (0.67-1) unstable; urgency=low + + * New upsteam version. + + Includes fix for VPATH builds from 0.66-1. + * debian/rules: Guard against multiple invocations of configure target + during build. Fixes failure when building twice in a row. Closes: #442680 + * debian/rules: Include optimised builds on i386. Closes: #433693 + * debian/rules: Remove obsolete touch commands needed only when patching + configure.ac. + * src/mpg123.[ch],man1/mpg123.1: New option -D to add delay between + songs. Modified version of patch supplied by Cédric Augonnet. + Closes: #50110 + + -- Daniel Kobras Wed, 19 Sep 2007 22:02:39 +0200 + +mpg123 (0.66-1.1) unstable; urgency=low + + * porter NMU + * Add armel to architecture list for mpg123-alsa. Closes: #431092 + + -- Joey Hess Mon, 10 Sep 2007 16:26:29 -0400 + +mpg123 (0.66-1) unstable; urgency=low + + * New upstream version. + + src/debug.h, src/httpget.c: Debug macro fixes merged upstream. + * src/Makefile.am, src/Makefile.in: Fix custom preprocessing directive + for asm files during VPATH builds. + * debian/rules: Fix incorrect quoting in clean target that prevented + reaping of build stamps. Closes: #424580 + * debian/rules: Man page moved to man1. Make sure to copy from new + location. + + -- Daniel Kobras Mon, 11 Jun 2007 23:31:30 +0200 + +mpg123 (0.65-1) unstable; urgency=low + + * New upstream version. Closes: #406842 + + Includes all our patches outside of the debian/ subdirectory. + + Improved ID3v2 handling. Closes: #105329 + * src/debug.h: Make sure that debug macros evaluate to a single + statement. Fix (yet another) compile error in audio_nas.c. + * src/httpget.c: Remove special cases in debug macro usage that + break with the above fix in place. + + -- Daniel Kobras Mon, 16 Apr 2007 22:07:53 +0200 + +mpg123 (0.61-5) unstable; urgency=high + + * src/httpget.c: Fix potential denial of service attack on premature + end-of-file from HTTP server (CVE-2007-0578). Patch taken from upstream's + 0.64 release. Closes: #409296 + + -- Daniel Kobras Mon, 5 Feb 2007 23:18:31 +0100 + +mpg123 (0.61-4) unstable; urgency=high + + * src/audio_oss.c: OSS output always uses formats in native endianness, + so don't additionally swap bytes on big endian architectures. + Closes: #398480 + + -- Daniel Kobras Tue, 14 Nov 2006 13:09:57 +0100 + +mpg123 (0.61-3) unstable; urgency=high + + * debian/control: 3dnow dummy package needs a versioned dependency on + the main mpg123 package. Other providers would also fulfill the + dependency otherwise. Closes: #398228 + + -- Daniel Kobras Sun, 12 Nov 2006 16:22:30 +0100 + +mpg123 (0.61-2) unstable; urgency=low + + * debian/control: Lift architecture restrictions of esd, nas, and alsa + flavours as much as possible. Build i486 variant on kfreebsd as well. + 3dnow version is only needed for upgrades and can stay linux-i386-only. + * debian/postinst.in: Increase priorities by 100 for mpg123 alternative to + get us above mpg321. We /are/ mpg123, after all, and we are free now. + Priorities for mp3-decoder remain unchanged. Closes: #394749 + * debian/rules: Take OS into account when building package lists to + keep kfreebsd happy. Thanks to Petr Salinger. Closes: #390939 + + -- Daniel Kobras Tue, 24 Oct 2006 14:13:44 +0200 + +mpg123 (0.61-1) unstable; urgency=low + + * New upstream version. + + Includes esd-related patches to configure and src/audio_esd.c. + Dropped our version from Debian diff. + + Abnormal exit of the program has been unified and improved. Returns + a more meaningful exit status now. Closes: #27870 + * src/audio_nas.c: Use correct error macro to fix compile error. + * debian/control: Turn mpg123-oss-3dnow into a dummy package, superseded + by main mpg123 package. + * debian/control: Don't build depend on alsa lib on hurd and kfreebsd. + * debian/control: Build main package on any architecture. Closes: #390939 + * debian/rules: Build with 3dnow optimisation by default on i386. Support + is deteced at runtime and falls back to our previous default optimisation + level. Closes: #368850 + * debian/rules: Reduce per-arch variables, use defaults for most archs. + + -- Daniel Kobras Mon, 23 Oct 2006 21:09:17 +0200 + +mpg123 (0.60-3) unstable; urgency=low + + * debian/rules: When generating $pkgname.mime, don't point to master + file but copy over its contents. Closes: #390450 + + -- Daniel Kobras Sun, 1 Oct 2006 17:21:19 +0200 + +mpg123 (0.60-2) unstable; urgency=low + + * debian/rules: Pass per-arch list of built packages to debhelper calls. + Fixes build failures on architectures that build only a subset of all + packages. Closes: #390077 + + -- Daniel Kobras Fri, 29 Sep 2006 11:04:42 +0200 + +mpg123 (0.60-1) unstable; urgency=low + + * New upstream release. + + Includes security fix for a heap overflow in httpget.c + (CVE-2006-3355). Closes: #377264 + * configure, configure.ac: Fix typo to make esd detection work. + * src/audio_esd.c: Always define audio_queueflush(). + * debian/compat: Set to debhelper compatibility level 5. + * debian/control: Move from non-free to main. Closes: #292260 + * debian/control: OSS versions depend on oss-compat now. + * debian/control: Build-depend on pkg-config. Configure script uses it. + * debian/control: Build-depend on dephelper and autotools-dev. + * debian/copyright: Download location now points to SourceForge site. + * debian/copyright: Document new copyright and license, and add pointer to + documentation of relicensing process. + * debian/mime: Require a terminal when called via mailcap. + * debian/rules: Debhelperize. + * debian/rules: Tweak rules for new configure-style build system. + * debian/rules: Add magic touches to prevent accidential rebuiling of + configure. + * debian/{control,rules}: Reinstate mpg123-alsa package now that current + ALSA versions are supported again. + + -- Daniel Kobras Thu, 14 Sep 2006 13:49:03 +0200 + +mpg123 (0.59r-22) unstable; urgency=high + + * layer3.c: Fix buffer overflow in III_i_stereo() (CVE-2006-1655). + Closes: #361863 + * mpg123.1: Fix several typos in man page. Patch thanks to A Costa. + Closes: #350356 + * decode_i386.c: Cheat around strict aliasing problem in WRITE_SAMPLE(). + * Makefile: Replace deprecated -mcpu option with -mtune in x86 targets. + * debian/control: Complies with version 3.6.2 of Debian policy. Bump + Standards-Version accordingly. + + -- Daniel Kobras Fri, 28 Apr 2006 18:27:35 +0200 + +mpg123 (0.59r-21) unstable; urgency=medium + + * Makefile: In linux-nas target, only link with libaudio, but not with + its dependent libs. + * Makefile: Likewise, in linux-*-esd targets remove explicit audiofile + linkage. + * Makefile: Use double rather than single quotes in OBJECTS definitions + to fix multi-line OBJECTS with recent implementations of GNU make. + * Makefile: Sprinkle some extra spaces after macro definitions to + placate gcc with recent GNU make. + * httpget.c: Do not forget to pass the target URL when using an HTTP + proxy. Closes: #311049 + * mpg123.c: Resync buffers when interrupted by Ctrl-c to clean out + remaining cruft. Also cures long delays when skipping songs in + buffered mode. Closes: #154509, #280034 + * mpg123.h: Complete fix from 0.59r-2 and remove external declaration + esdserver variable from mpg123.h. There's no need for it to be global. + Fixes build of linux-esd with recent gcc. + * mpg123.1: Correct description of -s option for mono input. + Closes: #326038 + * debian/control: Remove build-dependency on xlibs-dev because we no + longer link with libXau and libXt directly. Closes: #346937 + * debian/control: Likewise, remove libaudiofile-dev build-dependency. + * debian/control: Follow name change from nas-dev to libaudio-dev in + build dependencies. + * debian/rules: Define ARCH from dpkg-architecture rather than from + obsolete dpkg option. + + -- Daniel Kobras Mon, 16 Jan 2006 18:03:38 +0100 + +mpg123 (0.59r-20) unstable; urgency=high + + * httpget.c: Fix integer overflows in http parser, introduced by + security patch for CAN-2004-0982. + * httpget.c: Ensure minimum size of receive buffer to fix regression + in 0.59r-18, caused by patch for CAN-2004-0982. Closes: #294801 + + -- Daniel Kobras Sun, 8 May 2005 19:37:18 +0200 + +mpg123 (0.59r-19) unstable; urgency=high + + * layer2.c: Fix off-by-one error in boundary check introduced in -18. + Thanks to Jeremy Huddleston for noticing. + * layer1.c: Use proper parameter range in stereo test. + + -- Daniel Kobras Wed, 5 Jan 2005 17:18:30 +0100 + +mpg123 (0.59r-18) unstable; urgency=high + + * common.c, layer2.c: Fix insufficient validation of MPEG header + values, discovered by Yuri D'Elia (CAN-2004-0991). + * mpg123.c: Fix buffer overflow in playlist parser, discovered by + Bartlomiej Sieka (CAN-2004-1284). Thanks to Steve Kemp for the + patch. Closes: #287043 + * httpget.c: Fix further heap overflows in http parser. Backported + from the Gentoo patch for CAN-2004-0982. Original path was coded + by Jeremy Huddleston for version pre0.59s. + * mpg123.c: Fix NULL pointer dereference if http_open() fails. + * httpget.c, xfermem.c: Do not explicitly declare errno variable. + * audio.c: Include stdlib.h to silence compiler warning. + + -- Daniel Kobras Mon, 3 Jan 2005 23:11:32 +0100 + +mpg123 (0.59r-17) unstable; urgency=high + + * httpget.c: Fix heap overflow in http authentication handler + (CAN-2004-0982). Closes: #277948 + * mpg123.c: Apply patch by Dan Olson to fix handling of remote + playlists. Closes: #60058, #185544 + + -- Daniel Kobras Wed, 27 Oct 2004 00:16:23 +0200 + +mpg123 (0.59r-16) unstable; urgency=high + + * layer2.c: Fix buffer overflow in layer2 decoder (CVE ID CAN-2004-0805). + * Makefile: Fix compiler options to build for generic targets on ARM, + but optimise for xscale. Closes: #261255 + * README.3DNOW, dct36_3dnow.s, dct64_3dnow.s, decode_3dnow.s, + decode_i386.c, equalizer_3dnow.s, getcpuflags.s, layer3.c, mpg123.c, + mpg123.h, tabinit.c, debian/rules: Apply patch by KIMURA Takuhiro and + Syuuhei Kashiyama to fix errors in 3dnow-optimised decoding. + Thanks to Alberto Garcia for the patch-merging. Closes: #242212 + * debian/prerm: De-register mp3-decoder alternative. Closes: #222982 + * debian/changelog: Convert to utf8. + * debian/control: Bump standards version. + + -- Daniel Kobras Tue, 7 Sep 2004 15:57:57 +0200 + +mpg123 (0.59r-15) unstable; urgency=high + + * httpget.c: Fix heap overflow in http subsystem (cf. BID 8680, and Debian + bug #212584). As a side-effect, this imposes an upper limit on the + supported length of URLs (1013 characters). + * buffer.c: Fix potential loop in buffer process after parent has exited. + Closes: #181176 + * term.c: Do not send internal signals to whole process group. Patch thanks + to Rupert Levene. Closes: #192547 + * control_generic.c: Fix line reading (up to a max. length of 1023 + characters). Closes: #64789 + * mpg123.c: -R does not require any further argument on the command line. + * Makefile: Replace obsolete '-m486' by '-mcpu=i486'. + * mpg123.1: Add missing .TP separator. Closes: #190965 + * mpg123.1: Document format of equalizer file. Closes: #107221 + * README.Debian: Clarify that mpg123 does not contain GPLed code. + Closes: #149398 + * debian/rules: Distribute README.Debian. + * debian/postinst: Check arguments and only act when called with + 'configure'. + * debian/postinst: Install alternative for mp3-decoder. Closes: #144303 + + -- Daniel Kobras Sun, 28 Sep 2003 15:29:07 +0200 + +mpg123 (0.59r-14) unstable; urgency=high + + * Finally understood why size calculation of audio fragments broke + PPC support--we're actually violating OSS v1.1 specs, and PPC's + dmasound driver traps it. Reverted previous workaround and added + proper fix. + * common.h: Increase MAXFRAMESIZE to 3456 bytes, which is much closer to + reality. + * common.c: Add a sanity check on framesize overflow. Cannot happen now, + but let's be prepared. + * Makefile: Fix gcc commandline in linux-ppc target to keep gcc 3.2 happy. + * debian/postinst: Do not set symlink to /usr/doc. + * debian/control: Complies with current standards version. + + -- Daniel Kobras Wed, 29 Jan 2003 21:39:04 +0100 + +mpg123 (0.59r-13) unstable; urgency=low + + * Upstream's fix for zero length issue broke wav and cdr output. + Reverted and replaced with own version. Closes: #139300 + * Enable term control keys on all Linux targets. + + -- Daniel Kobras Fri, 22 Mar 2002 16:43:39 +0100 + +mpg123 (0.59r-12) unstable; urgency=low + + * The "my patch is bigger than yours" release. + * When playing the _first_ song in buffered mode, wait until the buffer + is completely filled up before any output is produced. The threshold + remains at 1/8 the buffer for all the later songs. This hack gives + live streams a chance to fill up the whole buffer. Closes: #34844 + * Clarify documentation of random play options. Closes: #131105 + * Initialise output early to prevent segfault on zero length files. + Closes: #97899 + * Applied slightly modified version of patch from Andreas Dilger + to recognize ID3 tags. + Closes: #72372, #81260, #105329 + * Applied patch from Erik B. Andersen for fixed + point arithmetic on arm. Closes: #72600 + * Applied patch from Chris Butler to fix size + calculation of OSS audio fragments. Added a hack to make the patch + work on PPC. (WTF? Might be a bug in PPC's OSS implementation.) + Closes: #79566 + * Shuffled includes in audio_oss.c to avoid redefinition of native + endian formats. + * Applied patch from Andreas Dilger to skip + over unplayable files during shuffle play. Closes: #60726 + * Applied patch from Martin Sjögren to + handle spaces in URLs. Closes: #75289 + * Updated standards version. + + -- Daniel Kobras Sat, 9 Mar 2002 21:45:55 +0100 + +mpg123 (0.59r-11) unstable; urgency=low + + * Don't buffer output if writing to a file. (Patch from upstream CVS.) + Closes: #67346 + * Introduce option --title to allow changing the window's title in an + xterm or rxvt. (Patch adapted from upstream CVS.) Document the new + option. Closes: #72453, #83907 + * Correct broken URLs in man page. Closes: #82049 + * Document control keys. (Patch from upstream CVS.) Closes: #111787 + * Enable and document option to gain realtime priority. Closes: #92046 + * Changed download location in copyright file to a working URL. + * Removed alsa build deps since the alsa version isn't built anyway. + * The nas target build depends on xlibs-dev for libXau. + * New Debian maintainer. Closes: #109254 + + -- Daniel Kobras Thu, 10 Jan 2002 00:52:04 +0100 + +mpg123 (0.59r-10) unstable; urgency=low + + * Debian QA upload. + * debian/control: Remove mpg123-alsa paragraph, as having it stay around + in the .dsc is confusing the archive scripts so that the old i386 binary + hasn't been removed. The old paragraph is in debian/control.alsa for + now. + + -- Colin Watson Fri, 30 Nov 2001 03:11:40 +0000 + +mpg123 (0.59r-9) unstable; urgency=low + + * Debian QA upload. + * Apply patch from Helge Deller to allow building on hppa + (closes: #110832). + + -- Colin Watson Sat, 1 Sep 2001 00:12:46 +0100 + +mpg123 (0.59r-8) unstable; urgency=low + + * Fix typo preventing build on powerpc (closes: #110134). + + -- Colin Watson Sun, 26 Aug 2001 13:43:47 +0100 + +mpg123 (0.59r-7) unstable; urgency=low + + * audio_oss.c: If opening /dev/dsp fails, try /dev/sound/dsp. + Thanks to Chet Hosey . Closes: #78169. + * layer3.c: Cast getbyte() to unsigned long for 64-bit arches. + Thanks to Christopher C. Chimelis . + Closes: #69944. Might be the same as #70552, but don't know. + * mpg123.1: Added the --wav, --au, --cdr options to the manpage. + Thanks to Roland Rosenfeld . Closes: #70786. + * debian/control: Provide mp3-decoder (Closes: #83247). Make + mpg123-oss-i486 have the same provides/conflicts as the other + packages. + * debian/rules: Use $(MAKE). Closes: #79563. + * mpg123.c: If $TERM is rxvt, send xterm title changing escape + codes. Thanks to Marcelo E. Magallon . + Closes: #103955. Note: the -C option doesn't seem to be working. + * Removed package mpg123-alsa until mpg123 is ported to the newer + ALSA API. Closes: #74234. + * New package mpg123-oss-3dnow. Closes: #101654. dct64_3dnow.s + and decode_3dnow.s had syntax errors, changed all "foo /comment" + to be two lines "/comment" and "foo". + * Orphaning the package, I've switched to using mpg321. + + -- Tommi Virtanen Sat, 18 Aug 2001 15:40:28 +0300 + +mpg123 (0.59r-6) unstable; urgency=low + + * Do not crash when $TERM is unset. Closes: #69123. + + -- Tommi Virtanen Sun, 27 Aug 2000 19:48:41 +0300 + +mpg123 (0.59r-5) unstable; urgency=low + + * Add "with support" to short package descriptions. + Closes: #65771. + * Fix off-by-one bounds check in translating genre numbers + to names. Closes: #68662. + * Don't use -DREAD_MMAP. Closes: #20258, #64490. + * Add new package mpg123-oss-i486, optimized for i486 CPUs. + * Undo part of earlier bugfix: if -R 'line' consisted only + of \n and/or \r, a buffer underflow would happen. + + -- Tommi Virtanen Sun, 27 Aug 2000 17:56:10 +0300 + +mpg123 (0.59r-4) unstable; urgency=low + + * Fix buffer underflow when remote control mode read(0,..) fails. + * Make remote control mode exit on eof instead of 100% CPU usage. + + -- Tommi Virtanen Sat, 27 May 2000 21:51:50 +0300 + +mpg123 (0.59r-3) unstable; urgency=low + + * Conflict with the mpg123 package from time + before the split. + + -- Tommi Virtanen Sat, 20 May 2000 01:14:49 +0300 + +mpg123 (0.59r-2) unstable; urgency=low + + * Yes Virginia, it is a newer version now. Closes: #61370. + * Split the package to mgp123{-esd,-alsa,-nas}. + Closes: #49940, #33416. + * Close all the bugs the previous maintainer + intended to close, but failed with the syntax. + Please reopen if they are not really fixed. + Closes: #32322, #27867, #28690, #17751, #14168, + #13659, #14118, #14759, #15312, #32668, #26899. + * It seems to be registered in mailcap already. Closes: #35770. + * Seems to handle stdin just fine. Closes: #22052. + * Seems to handle ctrl-C just fine. Closes: #32666, #25529. + * Added -lXt to mpg123-nas compilation to fix missing symbols + * Added declaration for esdserver in audio_esd.c + * Include support for ARM and Sparc architectures. + Needs testing. Closes: #58490, #53050. + * Remove all mentions of freeness from description. Closes: #48744. + + -- Tommi Virtanen Fri, 19 May 2000 23:29:43 +0300 + +mpg123 (0.59r-1) unstable; urgency=low + + * New maintainer + * New upstream version + * Rewrite packaging to get rid of debstd + * Upgraded to policy 3.1.1 (FHS, no Build-Depends needed) + * Wait for the next upload for bug fixing or package splitting.. + + -- Tommi Virtanen Tue, 16 May 2000 18:14:56 +0300 + +mpg123 (0.59q-2) unstable; urgency=low + + * fixes #15434: changelog.debian is compressed + * fixes #27867: manpage is correct + * fixes #28690: copyright file updated with new url + * fixes #17751, #14168, #17751: random with one file doesn't crash anymore + * fixes #13659, #14118, #14759, #15312: sound doesn't stop after 20 minutes + * many thanks to justin mccright for helping me clean these up + + -- Paul Haggart Sun, 14 Mar 1999 11:02:42 -0500 + +mpg123 (0.59q-1) unstable; urgency=low + + * fixes #32668: new upstream source + * i think we lost gmp3 support though.. the patch was none too clean + * fixes #32322: add -DUSE_MMAP to alpha + * fixes #26899: registered mime type for audio/mpeg + * updated standards version to current + + -- Paul Haggart Sun, 7 Feb 1999 17:14:17 -0500 + +mpg123 (0.59o-3) unstable; urgency=low + + * incorporated patches for gmp3 support + + -- Paul Haggart Sun, 2 Aug 1998 12:50:31 -0400 + +mpg123 (0.59o-2) frozen unstable; urgency=low + + * fixed #20301: compiles under m68k + + -- Paul Haggart Fri, 27 Mar 1998 15:19:43 -0500 + +mpg123 (0.59o-1) unstable; urgency=low + + * new upstream source + * fixed #17398: 8 bit cards supported with --8bit option + * fixed #15348: alpha architecture is supported + * fixed #14541: move me to non-free/sound! + + -- Paul Haggart Sat, 14 Mar 1998 10:02:57 -0500 + +mpg123 (0.59n-3) unstable; urgency=low + + * moved to non-free/sound for real now. + + -- Paul Haggart Tue, 10 Feb 1998 10:51:59 -0500 + +mpg123 (0.59n-2) unstable; urgency=low + + * really added support for non-i386 this time. last time I was just + kidding or something. + + -- Paul Haggart Sat, 7 Feb 1998 14:26:10 -0500 + +mpg123 (0.59n-1) unstable; urgency=low + + * new upstream source + * hopefully added support for non-i386 architectures + + -- Paul Haggart Sat, 24 Jan 1998 12:07:02 -0500 + +mpg123 (0.59m-3) unstable; urgency=low + + * okay, now we're -really- moved to non-free/sound. + + -- Paul Haggart Thu, 20 Nov 1997 18:00:36 -0500 + +mpg123 (0.59m-2) unstable; urgency=low + + * moved to non-free/sound because of DFSG non-compliance. + + -- Paul Haggart Tue, 18 Nov 1997 18:31:36 -0500 + +mpg123 (0.59m-1) unstable; urgency=low + + * new upstream source + + -- Paul Haggart Wed, 22 Oct 1997 21:55:13 -0400 + +mpg123 (0.59l-2) unstable; urgency=low + + * i386 only :( (bug #13833) + + -- Paul Haggart Mon, 13 Oct 1997 14:27:39 -0400 + +mpg123 (0.59l-1) unstable; urgency=low + + * new upstream version + + -- Paul Haggart Mon, 29 Sep 1997 15:59:57 -0400 + +mpg123 (0.59k-2) unstable; urgency=low + + * fixed bug #11465: mpg123 isn't i386 specific any more + + -- Paul Haggart Wed, 23 Jul 1997 20:10:42 -0400 + +mpg123 (0.59k-1) unstable; urgency=low + + * new upstream version + + -- Paul Haggart Sun, 13 Jul 1997 11:41:34 -0400 + +mpg123 (0.59i-1) unstable; urgency=low + + * new upstream version + + -- Paul Haggart Thu, 19 Jun 1997 17:03:15 -0400 + +mpg123 (0.59g-1) unstable; urgency=low + + * recompiled with libc6 + * new upstream source + + -- Paul Haggart Sun, 4 May 1997 00:11:44 -0400 + +mpg123 (0.59f-1) unstable; urgency=low + + * Initial Release. + + -- Paul Haggart Sun, 27 Apr 1997 15:09:37 -0400 + --- mpg123-1.12.1.orig/debian/compat +++ mpg123-1.12.1/debian/compat @@ -0,0 +1 @@ +5 --- mpg123-1.12.1.orig/debian/libmpg123-dev.install +++ mpg123-1.12.1/debian/libmpg123-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/lib/pkgconfig/libmpg123.pc +debian/tmp/usr/include/*.h +debian/tmp/usr/lib/*.a +debian/tmp/usr/lib/*.so --- mpg123-1.12.1.orig/debian/mpg123-oss-3dnow.preinst +++ mpg123-1.12.1/debian/mpg123-oss-3dnow.preinst @@ -0,0 +1,18 @@ +#!/bin/sh -e + +case "$1" in + upgrade) + update-alternatives --remove mpg123 /usr/bin/mpg123-oss-3dnow + update-alternatives --remove mp3-decoder \ + /usr/bin/mpg123-oss-3dnow + ;; + install|abort-upgrade) + ;; + *) + echo "$0 called with unknown argument '$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + --- mpg123-1.12.1.orig/debian/alt_deps.py +++ mpg123-1.12.1/debian/alt_deps.py @@ -0,0 +1,92 @@ +#!/usr/bin/env python +# +# +# +# Fold several dependency entries in a file into a single +# alternative dependency. + +import os +import sys + +def mangle(substvars, keyfilter, initdeps): + def __str2list(kv): + kv[1] = map(lambda x: x.strip(), kv[1].split(',')) + return kv[0], list(kv[1]) + + substvars=map(lambda x: x.split('=', 1), substvars) + substvars=map(__str2list, substvars) + + initdeps=map(lambda x: x.split('=', 1), initdeps) + initdeps=dict(map(__str2list, initdeps)) + + deps=dict(filter(lambda x: x[0] in keyfilter, substvars)) + + for k,v in initdeps.iteritems(): + deps[k] = deps.get(k, []) + v + + def __combine(a, b): + if len(b) == 0: + return [ [ x ] for x in a ] + return [ y + [ x ] for x in a for y in b ] + + def __normalise(ll): + ret = [] + for i in ll: + ret = __combine(i, ret) + return ret + + # This is deps.values(), essentially, but preserves ordering of + # dependencies as given in keyfilter. + deplist = [ deps.get(k) for k in keyfilter ] + deplist = filter(lambda x: x is not None, deplist) + + return ", ".join(map(lambda x: " | ".join(x), __normalise(deplist))) + +def usage(): + print "Usage: alt_deps.py " + \ + "[ ...]" + print " Fold several dependency entries in a file into a" + print " single alternative dependency. The is updated" + print " with a properly normalised new dependency entry." + print " Name of substvars file to modify" + print " Name of new dependency key" + print " Names of keys in to fold into single alternative" + print " Additional dependencies in substvars format" + +def handle_sysexception(e): + if e.filename is None: + print e.strerror + else: + print ": ".join((e.filename, e.strerror)) + sys.exit(1) + +if __name__ == "__main__": + if len(sys.argv) < 4: + usage() + sys.exit(1) + try: + fd = open(sys.argv[1], 'r+') + except EnvironmentError, e: + handle_sysexception(e) + + newkey = sys.argv[2] + keyfilter = sys.argv[3].split() + try: + initdeps = sys.argv[4:] + except: + initdeps = [] + + substvars = fd.readlines() + newdep = mangle(substvars, keyfilter, initdeps) + substvars = filter(lambda x: not x.startswith(newkey + '='), substvars) + substvars.append("=".join((newkey, newdep)) + '\n') + + try: + fd.seek(0, os.SEEK_SET) + fd.truncate() + fd.writelines(substvars) + fd.close() + except EnvironmentError, e: + handle_sysexception(e) + + sys.exit(0) --- mpg123-1.12.1.orig/debian/libmpg123-dev.examples +++ mpg123-1.12.1/debian/libmpg123-dev.examples @@ -0,0 +1 @@ +doc/examples/* --- mpg123-1.12.1.orig/debian/libmpg123-0.install +++ mpg123-1.12.1/debian/libmpg123-0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libmpg123.so.0* --- mpg123-1.12.1.orig/debian/libmpg123-0.symbols.amd64 +++ mpg123-1.12.1/debian/libmpg123-0.symbols.amd64 @@ -0,0 +1,2 @@ +#include "libmpg123-0.symbols.common.in" +#include "libmpg123-0.symbols.64bit.in" --- mpg123-1.12.1.orig/debian/mpg123-wrapper.in +++ mpg123-1.12.1/debian/mpg123-wrapper.in @@ -0,0 +1,4 @@ +#!/bin/sh + +exec /usr/bin/mpg123.bin -o @OUTPUT@ "$@" + --- mpg123-1.12.1.orig/debian/libmpg123-0.symbols.64bit.in +++ mpg123-1.12.1/debian/libmpg123-0.symbols.64bit.in @@ -0,0 +1,15 @@ + mpg123_decode_frame@Base 1.6.2 + mpg123_feedseek@Base 1.6.2 + mpg123_index@Base 1.6.2 + mpg123_length@Base 1.6.2 + mpg123_open@Base 1.6.2 + mpg123_open_fd@Base 1.6.2 + mpg123_position@Base 1.6.2 + mpg123_seek@Base 1.6.2 + mpg123_seek_frame@Base 1.6.2 + mpg123_set_filesize@Base 1.6.2 + mpg123_set_index@Base 1.10.0 + mpg123_tell@Base 1.6.2 + mpg123_tellframe@Base 1.6.2 + mpg123_tell_stream@Base 1.6.2 + mpg123_timeframe@Base 1.6.2 --- mpg123-1.12.1.orig/debian/libmpg123-0.symbols.powerpc +++ mpg123-1.12.1/debian/libmpg123-0.symbols.powerpc @@ -0,0 +1,2 @@ +#include "libmpg123-0.symbols.common.in" +#include "libmpg123-0.symbols.32bit.in" --- mpg123-1.12.1.orig/debian/libmpg123-0.symbols.mipsel +++ mpg123-1.12.1/debian/libmpg123-0.symbols.mipsel @@ -0,0 +1,2 @@ +#include "libmpg123-0.symbols.common.in" +#include "libmpg123-0.symbols.32bit.in" --- mpg123-1.12.1.orig/debian/mpg123-nas.NEWS +++ mpg123-1.12.1/debian/mpg123-nas.NEWS @@ -0,0 +1,11 @@ +mpg123-nas (1.4.3-1) unstable; urgency=low + + * mpg123 now supports a plugin architecture to select different output + mechanisms at runtime, using option -o. The Network Audio System plugin + can be accessed with "mpg123 -o nas". A wrapper skript mpg123-nas is + provided in the main package mpg123 for backward compatibility, but it is + likely to be removed in the next release cycle. As all functionality for + NAS output is provided by the main package mpg123, the dummy package + mpg123-nas can be safely removed after an upgrade. + + -- Daniel Kobras Sun, 15 Jun 2008 19:13:53 +0200 --- mpg123-1.12.1.orig/debian/mpg123-wrapper.1 +++ mpg123-1.12.1/debian/mpg123-wrapper.1 @@ -0,0 +1 @@ +.so man1/mpg123.bin.1 --- mpg123-1.12.1.orig/debian/libmpg123-0.symbols.hppa +++ mpg123-1.12.1/debian/libmpg123-0.symbols.hppa @@ -0,0 +1,2 @@ +#include "libmpg123-0.symbols.common.in" +#include "libmpg123-0.symbols.32bit.in" --- mpg123-1.12.1.orig/debian/libmpg123-0.symbols.arm +++ mpg123-1.12.1/debian/libmpg123-0.symbols.arm @@ -0,0 +1,2 @@ +#include "libmpg123-0.symbols.common.in" +#include "libmpg123-0.symbols.32bit.in" --- mpg123-1.12.1.orig/debian/copyright +++ mpg123-1.12.1/debian/copyright @@ -0,0 +1,66 @@ +This package was first debianized by Paul Haggart on +Sun, 27 Apr 1997 15:09:37 -0400. + +It was downloaded from: http://www.mpg123.de/download/ + +Upstream authors: Michael Hipp + Oliver Fromme + Thomas Orgis + Nicholas J Humfrey + +Copyright: (c) 1995-2006 by the mpg123 project (Michael Hipp, + Oliver Fromme, Thomas Orgis, Nicholas J Humfrey, + and contributors) + + "free software under the terms of the LGPL 2.1" + +The following clarification is taken verbatim from the file COPYING in the +source distribution: + + Code is copyrighted by Michael Hipp, who made it free software under + the terms of the LGPL 2.1. + + But that is not all of it. mpg123 is licensed under the GNU General + Lesser Public License, version 2.1, and in parts under the GNU General + Public License, version 2. That means that _all_ of mpg123 is licensed + under GPL and the major part also under the LGPL. + + Actually, the "major part" currently is the whole distributed package + of mpg123. There are some files (old alsa output, libao output) that + you get from our svn repository and that do not fall under LGPL. + + When the copyright marker in a source file says "the mpg123 project" + that means that the file contains code copyrighted by contributors to + mpg123, the "initially written by" naming the person(s) that created + the file and thus may have the largest part of copyrights on it. I am + explaining this here to emphasize that the copyright always actually + lies by the individual member (i.e. contributor to) of the mpg123 + project who wrote a specific section of code. Usage of a source code + management system like Subversion should provide keeping track of + individual copyright traces... + + Please consider that any code that is contributed to the mpg123 project + shall be licensed under LGPL 2.1 . If you want to contribute, but + don't agree to that (i.e. you want to have your code GPL only) please + say so - then, we either you convince is to include your code under + GPL, we convince you to make it LGPL instead or, as a last resort, + you'll have to do you own GPLed fork. But we should try to avoid the + last option... + + All files in the distribution that don't carry a license note on their + own are licensed under the terms of the LGPL 2.1; all files that do + carry either a LGPL or GPL note are licensed respectively under the + LGPL or GPL as follows: + + (...) + +where the complete texts of the GNU General Public License (GPL) version 2 and +the GNU Lesser General Public License (LGPL) version 2.1 have been omitted here +for brevity. On any Debian GNU/Linux system, they can be found in +`/usr/share/common-licenses/GPL-2', and '/usr/share/common-licenses/LGPL-2.1', +respectively. + +Earlier versions of mpg123 were distributed under a license that did not meet +Debian's free software guidelines. Details on the relicensing process can +be found in the file ROAD_TO_LGPL that is part of mpg123's source distribution. +It is located in the 'doc' subdirectory. --- mpg123-1.12.1.orig/debian/mpg123.NEWS +++ mpg123-1.12.1/debian/mpg123.NEWS @@ -0,0 +1,9 @@ +mpg123 (1.4.3-1) unstable; urgency=low + + * mpg123 now supports a plugin architecture to select different output + mechanisms at runtime, using option -o. The OSS output plugin + can be accessed with "mpg123 -o oss". A wrapper skript mpg123-oss is + provided with this package mpg123 for backward compatibility, but it is + likely to be removed in the next release cycle. + + -- Daniel Kobras Sun, 15 Jun 2008 19:18:22 +0200 --- mpg123-1.12.1.orig/debian/mpg123-oss-i486.NEWS +++ mpg123-1.12.1/debian/mpg123-oss-i486.NEWS @@ -0,0 +1,10 @@ +mpg123-oss-i486 (1.4.3-1) unstable; urgency=low + + * As of this version, an i486-optimised build is no longer provided as a + binary Debian package to limit the number of packaging flavours. Instead, + i486 will now use generic optimisations only, and mpg123-oss-i486 serves + as an empty dummy package that can be safely removed after an upgrade. + i486-specific optimisations are still available in the original source + distribution of mpg123 using configure flag --with-cpu=i486. + + -- Daniel Kobras Sun, 15 Jun 2008 19:08:20 +0200 --- mpg123-1.12.1.orig/debian/libmpg123-0.symbols.common.in +++ mpg123-1.12.1/debian/libmpg123-0.symbols.common.in @@ -0,0 +1,70 @@ +libmpg123.so.0 libmpg123-0 #MINVER# + mpg123_add_string@Base 1.6.2 + mpg123_add_substring@Base 1.6.2 + mpg123_clip@Base 1.6.2 + mpg123_close@Base 1.6.2 + mpg123_copy_string@Base 1.6.2 + mpg123_current_decoder@Base 1.7.2 + mpg123_decode@Base 1.6.2 + mpg123_decoder@Base 1.6.2 + mpg123_decoders@Base 1.6.2 + mpg123_delete@Base 1.6.2 + mpg123_delete_pars@Base 1.6.2 + mpg123_enc_from_id3@Base 1.9.1 + mpg123_encodings@Base 1.6.2 + mpg123_eq@Base 1.6.2 + mpg123_errcode@Base 1.6.2 + mpg123_exit@Base 1.6.2 + mpg123_feature@Base 1.10.0 + mpg123_feed@Base 1.6.2 + mpg123_fmt@Base 1.6.2 + mpg123_fmt_all@Base 1.6.2 + mpg123_fmt_none@Base 1.6.2 + mpg123_fmt_support@Base 1.6.2 + mpg123_format@Base 1.6.2 + mpg123_format_all@Base 1.6.2 + mpg123_format_none@Base 1.6.2 + mpg123_format_support@Base 1.6.2 + mpg123_framebyframe_decode@Base 1.10.0 + mpg123_framebyframe_next@Base 1.10.0 + mpg123_free_string@Base 1.6.2 + mpg123_geteq@Base 1.6.2 + mpg123_getformat@Base 1.6.2 + mpg123_getpar@Base 1.6.2 + mpg123_getparam@Base 1.6.2 + mpg123_getstate@Base 1.6.2 + mpg123_getvolume@Base 1.6.2 + mpg123_grow_string@Base 1.6.2 + mpg123_icy@Base 1.6.2 + mpg123_icy2utf8@Base 1.6.2 + mpg123_id3@Base 1.6.2 + mpg123_info@Base 1.6.2 + mpg123_init@Base 1.6.2 + mpg123_init_string@Base 1.6.2 + mpg123_meta_check@Base 1.6.2 + mpg123_new@Base 1.6.2 + mpg123_new_pars@Base 1.6.2 + mpg123_open_feed@Base 1.6.2 + mpg123_open_handle@Base 1.12.1 + mpg123_outblock@Base 1.6.2 + mpg123_par@Base 1.6.2 + mpg123_param@Base 1.6.2 + mpg123_parnew@Base 1.6.2 + mpg123_plain_strerror@Base 1.6.2 + mpg123_rates@Base 1.6.2 + mpg123_read@Base 1.6.2 + mpg123_replace_buffer@Base 1.6.2 + mpg123_replace_reader@Base 1.6.2 + mpg123_replace_reader_handle@Base 1.12.1 + mpg123_reset_eq@Base 1.6.2 + mpg123_resize_string@Base 1.6.2 + mpg123_safe_buffer@Base 1.6.2 + mpg123_scan@Base 1.6.2 + mpg123_set_string@Base 1.6.2 + mpg123_set_substring@Base 1.6.2 + mpg123_store_utf8@Base 1.9.1 + mpg123_strerror@Base 1.6.2 + mpg123_supported_decoders@Base 1.6.2 + mpg123_tpf@Base 1.6.2 + mpg123_volume@Base 1.6.2 + mpg123_volume_change@Base 1.6.2 --- mpg123-1.12.1.orig/debian/mpg123.postinst +++ mpg123-1.12.1/debian/mpg123.postinst @@ -0,0 +1,64 @@ +#!/bin/sh -e + +remove_alternative() +{ + test -n "$1" || continue + + FILENAME="$1" + + update-alternatives --remove mpg123 "/usr/bin/$FILENAME" + update-alternatives --remove mp3-decoder "/usr/bin/$FILENAME" +} + +install_alternative() +{ + test -n "$1" || continue + test -n "$2" || continue + + FILENAME="$1" + PRIORITY="$2" + + test -e "/usr/bin/$FILENAME" || continue + + # Not a typo: For mpg123, we effectively add 100 to the + # priority used for mp3-decoder to get us atop of mpg321. + # We /are/ mpg123, after all, and we are no longer non-free. + # This hack can be dropped if mpg321 chooses to lower its + # mpg123 priority. + update-alternatives --install \ + /usr/bin/mpg123 mpg123 "/usr/bin/$FILENAME" \ + "1$PRIORITY" \ + --slave /usr/share/man/man1/mpg123.1.gz mpg123.1.gz \ + "/usr/share/man/man1/$FILENAME.1.gz" + + update-alternatives --install \ + /usr/bin/mp3-decoder mp3-decoder "/usr/bin/$FILENAME" \ + "$PRIORITY" \ + --slave /usr/share/man/man1/mp3-decoder.1.gz \ + mp3-decoder.1.gz \ + "/usr/share/man/man1/$FILENAME.1.gz" +} + +case "$1" in + configure) + # Specific alternatives are no longer required with + # output auto-detection. + OBSOLETES="mpg123-oss mpg123-alsa mpg123-esd mpg123-nas mpg123-oss-i486" + for i in $OBSOLETES; do + remove_alternative "$i" + done + + # Install generic binary as the only alternative. + install_alternative mpg123.bin 20 + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \'$1\'" >&2 + exit 0 +esac + +#DEBHELPER# + +exit 0 + --- mpg123-1.12.1.orig/debian/libmpg123-0.symbols.m68k +++ mpg123-1.12.1/debian/libmpg123-0.symbols.m68k @@ -0,0 +1,2 @@ +#include "libmpg123-0.symbols.common.in" +#include "libmpg123-0.symbols.32bit.in" --- mpg123-1.12.1.orig/debian/libmpg123-0.symbols.alpha +++ mpg123-1.12.1/debian/libmpg123-0.symbols.alpha @@ -0,0 +1,2 @@ +#include "libmpg123-0.symbols.common.in" +#include "libmpg123-0.symbols.64bit.in" --- mpg123-1.12.1.orig/debian/libmpg123-0.symbols.sparc +++ mpg123-1.12.1/debian/libmpg123-0.symbols.sparc @@ -0,0 +1,2 @@ +#include "libmpg123-0.symbols.common.in" +#include "libmpg123-0.symbols.32bit.in" --- mpg123-1.12.1.orig/debian/libmpg123-0.symbols +++ mpg123-1.12.1/debian/libmpg123-0.symbols @@ -0,0 +1 @@ +#include "libmpg123-0.symbols.common.in" --- mpg123-1.12.1.orig/debian/mpg123-alsa.NEWS +++ mpg123-1.12.1/debian/mpg123-alsa.NEWS @@ -0,0 +1,11 @@ +mpg123-alsa (1.4.3-1) unstable; urgency=low + + * mpg123 now supports a plugin architecture to select different output + mechanisms at runtime, using option -o. The ALSA output plugin + can be accessed with "mpg123 -o alsa". A wrapper skript mpg123-alsa is + provided in the main package mpg123 for backward compatibility, but it is + likely to be removed in the next release cycle. As all functionality for + ALSA output is provided by the main package mpg123, the dummy package + mpg123-alsa can be safely removed after an upgrade. + + -- Daniel Kobras Sun, 15 Jun 2008 19:16:04 +0200 --- mpg123-1.12.1.orig/debian/libmpg123-0.symbols.i386 +++ mpg123-1.12.1/debian/libmpg123-0.symbols.i386 @@ -0,0 +1,2 @@ +#include "libmpg123-0.symbols.common.in" +#include "libmpg123-0.symbols.32bit.in" --- mpg123-1.12.1.orig/debian/libmpg123-0.symbols.s390 +++ mpg123-1.12.1/debian/libmpg123-0.symbols.s390 @@ -0,0 +1,2 @@ +#include "libmpg123-0.symbols.common.in" +#include "libmpg123-0.symbols.32bit.in" --- mpg123-1.12.1.orig/debian/mpg123.manpages +++ mpg123-1.12.1/debian/mpg123.manpages @@ -0,0 +1 @@ +usr/share/man/*/* --- mpg123-1.12.1.orig/debian/mpg123-esd.NEWS +++ mpg123-1.12.1/debian/mpg123-esd.NEWS @@ -0,0 +1,11 @@ +mpg123-esd (1.4.3-1) unstable; urgency=low + + * mpg123 now supports a plugin architecture to select different output + mechanisms at runtime, using option -o. The ESD output plugin + can be accessed with "mpg123 -o esd". A wrapper skript mpg123-esd is + provided in the main package mpg123 for backward compatibility, but it is + likely to be removed in the next release cycle. As all functionality for + ESD output is provided by the main package mpg123, the dummy package + mpg123-esd can be safely removed after an upgrade. + + -- Daniel Kobras Sun, 15 Jun 2008 19:15:03 +0200 --- mpg123-1.12.1.orig/debian/mpg123.install +++ mpg123-1.12.1/debian/mpg123.install @@ -0,0 +1,5 @@ +debian/tmp/usr/bin/* +debian/tmp/usr/share/man/*/* +debian/tmp/usr/lib/mpg123/*.la +debian/tmp/usr/lib/mpg123/*.so + --- mpg123-1.12.1.orig/debian/mpg123.prerm +++ mpg123-1.12.1/debian/mpg123.prerm @@ -0,0 +1,18 @@ +#!/bin/sh -e + +case "$1" in + upgrade) ;; + remove|failed-upgrade|deconfigure) + for i in mpg123.bin mpg123-oss mpg123-alsa mpg123-esd mpg123-nas \ + mpg123-oss-i486; do + test -e "/usr/bin/$i" || continue + update-alternatives --remove mpg123 "/usr/bin/$i" + update-alternatives --remove mp3-decoder "/usr/bin/$i" + done + ;; +esac + +#DEBHELPER# + +exit 0 + --- mpg123-1.12.1.orig/debian/control +++ mpg123-1.12.1/debian/control @@ -0,0 +1,136 @@ +Source: mpg123 +Section: sound +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Daniel Kobras +Standards-Version: 3.8.4 +Build-Depends: debhelper (>> 5), autotools-dev, autoconf, automake, pkg-config, libltdl3-dev, libesd0-dev, libaudio-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libjack-dev, libpulse-dev [!hurd-i386], python-minimal + +Package: mpg123 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: ${shlibs:Recommends}, ${plugin:Recommends} +Suggests: ${shlibs:Suggests} +Provides: mp3-decoder, mpg123-oss-3dnow +Replaces: mpg123-oss-3dnow, mpg123-alsa, mpg123-esd, mpg123-nas, mpg123-oss-i486 +Description: MPEG layer 1/2/3 audio player + Mpg123 is a fast and portable MPEG audio player for Unix. It supports + MPEG 1.0/2.0 layers 1, 2 and 3 (those famous "mp3" files). + . + For full CD quality playback (44 kHz, 16 bit, stereo) a Pentium, + SPARCstation10, DEC Alpha or similar CPU is required. Mono and/or reduced + quality playback (22 kHz or 11 kHz) is even possible on 486 CPUs. + . + This package contains output plugins for several audio systems, including + OSS/Lite, the Advanced Linux Sound Architecture (ALSA) on Linux systems, + the Enlightened Sound Daemon (esound), the Network Audio System (NAS), + and others. + +Package: libmpg123-0 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: MPEG layer 1/2/3 audio decoder -- runtime library + Mpg123 is a fast and portable MPEG audio decoder for Unix. It supports + MPEG 1.0/2.0 layers 1, 2 and 3 (those famous "mp3" files). + . + For full CD quality playback (44 kHz, 16 bit, stereo) a Pentium, + SPARCstation10, DEC Alpha or similar CPU is required. Mono and/or reduced + quality playback (22 kHz or 11 kHz) is even possible on 486 CPUs. + . + This package contains the C libraries needed to run executables that use + the mpg123 library. + +Package: libmpg123-dev +Architecture: any +Section: libdevel +Depends: ${shlibs:Depends}, ${misc:Depends}, libmpg123-0 (= ${binary:Version}) +Description: MPEG layer 1/2/3 audio decoder -- development files + Mpg123 is a fast and portable MPEG audio decoder for Unix. It supports + MPEG 1.0/2.0 layers 1, 2 and 3 (those famous "mp3" files). + . + For full CD quality playback (44 kHz, 16 bit, stereo) a Pentium, + SPARCstation10, DEC Alpha or similar CPU is required. Mono and/or reduced + quality playback (22 kHz or 11 kHz) is even possible on 486 CPUs. + . + This package contains the C development headers and library files needed to + compile programs using the mpg123 library. + +Package: mpg123-oss-i486 +Architecture: i386 kfreebsd-i386 +Depends: mpg123 (>= 1.4.3-1), ${misc:Depends}, oss-compat +Provides: mpg123, mp3-decoder +Conflicts: mpg123 (<< 0.59r-2) +Description: MPEG layer 1/2/3 audio player for i486 machines - dummy package + Mpg123 is a fast and portable MPEG audio player for Unix. It supports + MPEG 1.0/2.0 layers 1, 2 and 3 (those famous "mp3" files). + . + For full CD quality playback (44 kHz, 16 bit, stereo) a Pentium, + SPARCstation10, DEC Alpha or similar CPU is required. Mono and/or reduced + quality playback (22 kHz or 11 kHz) is even possible on 486 CPUs. + . + This package used to contain an executable specially optimized for i486 + processors, but nowadays just depends on the generic package mpg123. It is + an empty dummy package to facilitate upgrades and can be safely removed. + +Package: mpg123-oss-3dnow +Architecture: i386 +Depends: mpg123 (>= 0.61-1), ${misc:Depends} +Description: MPEG layer 1/2/3 audio player for 3DNow! machines - dummy package + Mpg123 is a fast and portable MPEG audio player for Unix. It supports + MPEG 1.0/2.0 layers 1, 2 and 3 (those famous "mp3" files). + . + For full CD quality playback (44 kHz, 16 bit, stereo) a Pentium, + SPARCstation10, DEC Alpha or similar CPU is required. Mono and/or reduced + quality playback (22 kHz or 11 kHz) is even possible on 486 CPUs. + . + An mpg123 optimised for the 3DNow! command set nowadays is part of the main + package mpg123. This is an empty dummy package to facilitate upgrades and + can be safely removed. + +Package: mpg123-esd +Architecture: any +Depends: mpg123 (>= 1.4.3-1), ${misc:Depends}, ${esdplugin:Recommends} +Suggests: esound +Description: MPEG layer 1/2/3 audio player with Esound support - dummy package + Mpg123 is a fast and portable MPEG audio player for Unix. It supports + MPEG 1.0/2.0 layers 1, 2 and 3 (those famous "mp3" files). + . + For full CD quality playback (44 kHz, 16 bit, stereo) a Pentium, + SPARCstation10, DEC Alpha or similar CPU is required. Mono and/or reduced + quality playback (22 kHz or 11 kHz) is even possible on 486 CPUs. + . + The main mpg123 nowadays already contains an esd output plugin by default. + This is an empty dummy package to facilitate upgrades. It can be safely + removed afterwards. + +Package: mpg123-nas +Architecture: any +Depends: mpg123 (>= 1.4.3-1), ${misc:Depends}, ${nasplugin:Recommends} +Suggests: nas +Description: MPEG layer 1/2/3 audio player with NAS support - dummy package + Mpg123 is a fast and portable MPEG audio player for Unix. It supports + MPEG 1.0/2.0 layers 1, 2 and 3 (those famous "mp3" files). + . + For full CD quality playback (44 kHz, 16 bit, stereo) a Pentium, + SPARCstation10, DEC Alpha or similar CPU is required. Mono and/or reduced + quality playback (22 kHz or 11 kHz) is even possible on 486 CPUs. + . + The main mpg123 nowadays already contains an output plugin for NAS by default. + This is an empty dummy package to facilitate upgrades. It can be safely + removed afterwards. + +Package: mpg123-alsa +Architecture: any +Depends: mpg123 (>= 1.4.3-1), ${misc:Depends}, ${alsaplugin:Recommends} +Description: MPEG layer 1/2/3 audio player with ALSA support - dummy package + Mpg123 is a fast and portable MPEG audio player for Unix. It supports + MPEG 1.0/2.0 layers 1, 2 and 3 (those famous "mp3" files). + . + For full CD quality playback (44 kHz, 16 bit, stereo) a Pentium, + SPARCstation10, DEC Alpha or similar CPU is required. Mono and/or reduced + quality playback (22 kHz or 11 kHz) is even possible on 486 CPUs. + . + The main mpg123 nowadays already contains an output plugin for ALSA by default. + This is an empty dummy package to facilitate upgrades. It can be safely + removed afterwards. --- mpg123-1.12.1.orig/debian/mpg123.mime +++ mpg123-1.12.1/debian/mpg123.mime @@ -0,0 +1,2 @@ +audio/mpeg; mpg123 -q %s; priority=5; needsterminal + --- mpg123-1.12.1.orig/debian/rules +++ mpg123-1.12.1/debian/rules @@ -0,0 +1,201 @@ +#!/usr/bin/make -f + +PACKAGE:=mpg123 + +ARCH:=$(shell dpkg-architecture -qDEB_HOST_GNU_CPU) +OS:=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +CPU:=$(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) + +WRAPPER_TARGETS:=mpg123-oss mpg123-esd mpg123-nas + +ifeq ($(ARCH),i486) +WRAPPER_TARGETS += mpg123-oss-i486 +endif + +ifeq ($(OS),linux) +WRAPPER_TARGETS += mpg123-alsa +endif + +CONF_COMMON:=--prefix=/usr --enable-static --enable-shared --disable-ltdl-install + +CONF_i486:=--with-cpu=x86_dither +CONF_arm:=--with-cpu=generic_nofpu + +SOVERSION:=0 +LIB_PKG:=libmpg123-$(SOVERSION) +DEV_PKG:=libmpg123-dev +LIB_PKGSTR:=-p$(LIB_PKG) -p$(DEV_PKG) +ARCH_PKGSTR=-pmpg123 +ALL_PKGSTR=$(LIB_PKGSTR) $(ARCH_PKGSTR) + +DUMMY_PKGSTR=-pmpg123-esd -pmpg123-nas +ifeq ($(OS),linux) +DUMMY_PKGSTR += -pmpg123-alsa +ifeq ($(ARCH),i486) +DUMMY_PKGSTR += -pmpg123-oss-3dnow -pmpg123-oss-i486 +endif +else +ifeq ($(OS),kfreebsd) +ifeq ($(ARCH),i486) +DUMMY_PKGSTR += -pmpg123-oss-i486 +endif +endif +endif + +CFLAGS = +LDFLAGS = + +# Add hardening options. OS and architecture restrictions are stolen from +# package hardening-wrapper. +ifeq (,$(findstring noharden,$(DEB_BUILD_OPTIONS))) +# configure script currently chokes on -Werror +# CFLAGS += -Wformat -Werror=format-security + CFLAGS += -Wformat + LDFLAGS += -Wl,-z,relro +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -D_FORTIFY_SOURCE=2 +endif +ifeq (,$(findstring :$(CPU):,:ia64:alpha:mips:mipsel:hppa:arm:)) + CFLAGS += -fstack-protector +endif +ifneq (,$(findstring :$(OS):,:linux:knetbsd:)) +ifeq (,$(findstring :$(CPU):,:hppa:m68k:arm:mips:mipsel:)) + CFLAGS += -fPIE + LDFLAGS += -pie +endif +endif +endif + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + + +#export DH_VERBOSE=1 + +mpg123: $(WRAPPER_TARGETS) + dh_testdir + + $(MAKE) + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + mv $(CURDIR)/debian/tmp/usr/bin/mpg123 \ + $(CURDIR)/debian/tmp/usr/bin/mpg123.bin + mv $(CURDIR)/debian/tmp/usr/share/man/man1/mpg123.1 \ + $(CURDIR)/debian/tmp/usr/share/man/man1/mpg123.bin.1 + install $(WRAPPER_TARGETS) $(CURDIR)/debian/tmp/usr/bin/ + for i in $(WRAPPER_TARGETS); do \ + install debian/mpg123-wrapper.1 \ + $(CURDIR)/debian/tmp/usr/share/man/man1/$$i.1; \ + done + +mpg123-%: debian/mpg123-wrapper.in + dh_testdir + o=`echo $@ | sed -e 's/^mpg123-\([^-]\+\).*/\1/'`; \ + sed -e "s/@OUTPUT@/$$o/g" < debian/mpg123-wrapper.in > $@ + +build: build-stamp +build-stamp: configure mpg123 + touch build-stamp + +configure: configure-stamp +configure-stamp: + dh_testdir + + if test -f "$(CURDIR)/build/config.sub"; then \ + mv "$(CURDIR)/build/config.sub" "$(CURDIR)/debian/"; \ + fi + if test -f "$(CURDIR)/build/config.guess"; then \ + mv "$(CURDIR)/build/config.guess" "$(CURDIR)/debian/"; \ + fi + + ln -sf /usr/share/misc/config.sub "$(CURDIR)/build/" + ln -sf /usr/share/misc/config.guess "$(CURDIR)/build/" + + # One patch touches configure.ac, so we need to regenerate the + # configure script. + autoreconf --verbose + + CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ + ./configure $(CONF_COMMON) $(CONF_$(ARCH)) || \ + { ret=$?; cat config.log; exit $$ret; } + + touch configure-stamp + +clean: + dh_testdir + dh_testroot + + -rm -f build-stamp configure-stamp + -rm -f $(WRAPPER_TARGETS) + test ! -f Makefile || $(MAKE) distclean + + if test -L "$(CURDIR)/build/config.sub"; then \ + rm -f "$(CURDIR)/build/config.sub"; \ + if test -e "$(CURDIR)/debian/config.sub"; then \ + mv "$(CURDIR)/debian/config.sub" "$(CURDIR)/build/"; \ + fi; \ + fi + if test -L "$(CURDIR)/build/config.guess"; then \ + rm -f "$(CURDIR)/build/config.guess"; \ + if test -e "$(CURDIR)/debian/config.guess"; then \ + mv "$(CURDIR)/debian/config.guess" "$(CURDIR)/build/"; \ + fi; \ + fi + + # Cleanup after autoreconf + -rm -f "$(CURDIR)"/Makefile.in \ + "$(CURDIR)"/aclocal.m4 \ + "$(CURDIR)"/configure \ + "$(CURDIR)"/doc/Makefile.in \ + "$(CURDIR)"/src/Makefile.in \ + "$(CURDIR)"/src/config.h.in \ + "$(CURDIR)"/src/libmpg123/Makefile.in \ + "$(CURDIR)"/src/output/Makefile.in + + dh_clean + +binary-indep: build + +install: build + dh_testdir + dh_testroot + dh_install $(ALL_PKGSTR) + dh_installdocs $(LIB_PKGSTR) $(DUMMY_PKGSTR) + dh_installdocs $(ARCH_PKGSTR) -A \ + README AUTHORS doc/BENCHMARKING doc/CONTACT \ + doc/README.gain doc/README.remote doc/THANKS + dh_installexamples $(LIB_PKGSTR) + dh_installman $(ARCH_PKGSTR) + dh_installchangelogs $(DUMMY_PKGSTR) + dh_installchangelogs $(ARCH_PKGSTR) NEWS + dh_installchangelogs $(LIB_PKGSTR) NEWS.libmpg123 + dh_installmime $(ARCH_PKGSTR) + dh_strip $(ALL_PKGSTR) + dh_compress $(ALL_PKGSTR) $(DUMMY_PKGSTR) + dh_fixperms $(ALL_PKGSTR) $(DUMMY_PKGSTR) + dh_makeshlibs $(LIB_PKGSTR) -V "$(LIB_PKG) (>= 1.7.2)" + dh_installdeb $(ALL_PKGSTR) + dh_shlibdeps $(ALL_PKGSTR) -Xdebian/mpg123/usr/lib/mpg123/ -- \ + -dSuggests `find debian/mpg123/usr/lib/mpg123/ -name "output_*.so" -type f` -dDepends + for n in alsa dummy esd nas oss; do \ + i="debian/mpg123/usr/lib/mpg123/output_$$n.so"; \ + test -e "$$i" || continue; \ + dh_shlibdeps $(ARCH_PKGSTR) $(DUMMY_PKGSTR) -Xdebian/mpg123/usr/lib/mpg123 debian/mpg123 -- -p"$$n"plugin -dRecommends "$$i" -dDepends; \ + done + chmod +x "$(CURDIR)/debian/alt_deps.py" + "$(CURDIR)/debian/alt_deps.py" "$(CURDIR)/debian/mpg123.substvars" \ + plugin:Recommends \ + "alsaplugin:Recommends ossplugin:Recommends dummyplugin:Recommends" \ + ossplugin:Recommends=oss-compat + dh_gencontrol $(ALL_PKGSTR) + dh_gencontrol $(DUMMY_PKGSTR) -- -Tdebian/mpg123.substvars + dh_md5sums $(ALL_PKGSTR) $(DUMMY_PKGSTR) + dh_builddeb $(ALL_PKGSTR) $(DUMMY_PKGSTR) + +binary-arch: build install + +binary: binary-indep binary-arch + +.PHONY: build clean configure install binary binary-arch binary-indep --- mpg123-1.12.1.orig/debian/libmpg123-0.symbols.ia64 +++ mpg123-1.12.1/debian/libmpg123-0.symbols.ia64 @@ -0,0 +1,2 @@ +#include "libmpg123-0.symbols.common.in" +#include "libmpg123-0.symbols.64bit.in" --- mpg123-1.12.1.orig/debian/libmpg123-0.symbols.32bit.in +++ mpg123-1.12.1/debian/libmpg123-0.symbols.32bit.in @@ -0,0 +1,15 @@ + mpg123_decode_frame_64@Base 1.6.2 + mpg123_feedseek_64@Base 1.6.2 + mpg123_index_64@Base 1.6.2 + mpg123_length_64@Base 1.6.2 + mpg123_open_64@Base 1.6.2 + mpg123_open_fd_64@Base 1.6.2 + mpg123_position_64@Base 1.6.2 + mpg123_seek_64@Base 1.6.2 + mpg123_seek_frame_64@Base 1.6.2 + mpg123_set_filesize_64@Base 1.6.2 + mpg123_set_index_64@Base 1.10.0 + mpg123_tell_64@Base 1.6.2 + mpg123_tellframe_64@Base 1.6.2 + mpg123_tell_stream_64@Base 1.6.2 + mpg123_timeframe_64@Base 1.6.2 --- mpg123-1.12.1.orig/debian/libmpg123-0.symbols.armel +++ mpg123-1.12.1/debian/libmpg123-0.symbols.armel @@ -0,0 +1,2 @@ +#include "libmpg123-0.symbols.common.in" +#include "libmpg123-0.symbols.32bit.in" --- mpg123-1.12.1.orig/debian/libmpg123-0.symbols.mips +++ mpg123-1.12.1/debian/libmpg123-0.symbols.mips @@ -0,0 +1,2 @@ +#include "libmpg123-0.symbols.common.in" +#include "libmpg123-0.symbols.32bit.in"