Control: tags 814879 + patch Control: tags 814879 + pending Dear maintainer,
I've prepared an NMU for timidity (versioned as 2.13.2-40.4) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
more about me: http://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
diffstat for timidity-2.13.2 timidity-2.13.2 changelog | 9 +++++ control | 68 ++++++++++++++++++++++++++++++-------- copyright | 2 - patches/libpng1.5.patch | 48 ++++++++++++++++++++++++++ patches/series | 1 timidity-interfaces-extra.install | 3 - timidity.docs | 2 - timidity.install | 6 +-- 8 files changed, 119 insertions(+), 20 deletions(-) diff -Nru timidity-2.13.2/debian/changelog timidity-2.13.2/debian/changelog --- timidity-2.13.2/debian/changelog 2015-12-23 19:16:31.000000000 +0000 +++ timidity-2.13.2/debian/changelog 2016-04-07 14:04:35.000000000 +0000 @@ -1,3 +1,12 @@ +timidity (2.13.2-40.4) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with libpng 1.5 and newer. Closes: #814879 + * Run wrap-and-sort. + * Explicit Build-Depends on libpng-dev + + -- Mattia Rizzolo <mat...@debian.org> Thu, 07 Apr 2016 14:04:03 +0000 + timidity (2.13.2-40.3) unstable; urgency=medium * Non-maintainer upload. diff -Nru timidity-2.13.2/debian/control timidity-2.13.2/debian/control --- timidity-2.13.2/debian/control 2013-09-30 19:12:49.000000000 +0000 +++ timidity-2.13.2/debian/control 2016-04-07 14:03:48.000000000 +0000 @@ -2,16 +2,48 @@ Section: sound Priority: optional Maintainer: Geoffrey Thomas <geo...@ldpreload.com> -Uploaders: Karl Ramm <k...@debian.org> -Build-Depends: debhelper (>= 7), libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudiofile-dev, libesd0-dev, libjack-dev, libaudio-dev, libvorbis-dev (>= 1.0.0-3), libspeex-dev (>= 1.0), libflac-dev (>= 1.1.4), libncurses-dev, libslang2-dev, libx11-dev, libxext-dev, libxmu-dev, libxpm-dev, libxt-dev, libxaw7-dev, tcl-dev, tk-dev, libgtk2.0-dev, autotools-dev, dpkg-dev (>= 1.16.0) +Uploaders: + Karl Ramm <k...@debian.org>, +Build-Depends: + autotools-dev, + debhelper (>= 7), + dpkg-dev (>= 1.16.0), + libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libaudio-dev, + libaudiofile-dev, + libesd0-dev, + libflac-dev (>= 1.1.4), + libgtk2.0-dev, + libjack-dev, + libncurses-dev, + libpng-dev, + libslang2-dev, + libspeex-dev (>= 1.0), + libvorbis-dev (>= 1.0.0-3), + libx11-dev, + libxaw7-dev, + libxext-dev, + libxmu-dev, + libxpm-dev, + libxt-dev, + tcl-dev, + tk-dev, Standards-Version: 3.9.2 Homepage: http://timidity.sourceforge.net/ Package: timidity Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.2-13) -Recommends: freepats, timidity-daemon -Suggests: pmidi, fluid-soundfont-gm, fluid-soundfont-gs +Depends: + lsb-base (>= 3.2-13), + ${misc:Depends}, + ${shlibs:Depends}, +Recommends: + freepats, + timidity-daemon, +Suggests: + fluid-soundfont-gm, + fluid-soundfont-gs, + pmidi, Description: Software sound renderer (MIDI sequencer, MOD player) TiMidity++ is a very high quality software-only MIDI sequencer and MOD player. It uses sound fonts (GUS-compatible or SF2-compatible) to render MIDI files, @@ -34,10 +66,14 @@ Package: timidity-interfaces-extra Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, timidity (= ${binary:Version}) -Replaces: timidity (<< 2.12.0) +Depends: + timidity (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Replaces: + timidity (<< 2.12.0), Description: TiMidity++ extra user interfaces - TiMidity++ is a very high quality software-only MIDI sequencer and MOD + TiMidity++ is a very high quality software-only MIDI sequencer and MOD player. . This package provides extra TiMidity++ user interfaces, which have @@ -48,7 +84,10 @@ Package: timidity-el Section: lisp Architecture: all -Depends: emacsen-common, ${misc:Depends}, timidity (>= ${source:Version}) +Depends: + emacsen-common, + timidity (>= ${source:Version}), + ${misc:Depends}, Description: Emacs front end to Timidity++ The timidity.el Emacs-Lisp program is a front-end to the TiMidity++ software- only MIDI sequencer and MOD player. You can play MIDI amd MOD files directly @@ -57,11 +96,14 @@ Package: timidity-daemon Section: sound Architecture: all -Depends: ${misc:Depends}, timidity (>= ${source:Version}), adduser -Replaces: timidity (<< 2.13.2-31) +Depends: + adduser, + timidity (>= ${source:Version}), + ${misc:Depends}, +Replaces: + timidity (<< 2.13.2-31), Description: runs TiMidity++ as a system-wide MIDI sequencer - TiMidity++ is a very high quality software-only MIDI sequencer and MOD + TiMidity++ is a very high quality software-only MIDI sequencer and MOD player. . This package provides TiMidity++ as a system-wide MIDI sequencer. - diff -Nru timidity-2.13.2/debian/copyright timidity-2.13.2/debian/copyright --- timidity-2.13.2/debian/copyright 2008-11-23 11:20:12.000000000 +0000 +++ timidity-2.13.2/debian/copyright 2016-04-07 14:03:48.000000000 +0000 @@ -21,7 +21,7 @@ Authors: Tuukka Toivonen <t...@cgs.fi>, Masanao Izumo <m...@goice.co.jp> and others. -Copyright: +Copyright: Copyright (C) 1999-2002 Masanao Izumo <m...@goice.co.jp> Copyright (C) 1995 Tuukka Toivonen <t...@cgs.fi> diff -Nru timidity-2.13.2/debian/patches/libpng1.5.patch timidity-2.13.2/debian/patches/libpng1.5.patch --- timidity-2.13.2/debian/patches/libpng1.5.patch 1970-01-01 00:00:00.000000000 +0000 +++ timidity-2.13.2/debian/patches/libpng1.5.patch 2016-04-07 14:02:24.000000000 +0000 @@ -0,0 +1,48 @@ +Description: Fix to fit with libpng 1.5 and newer +Origin: upstream, https://sourceforge.net/p/timidity/git/ci/6ca65d8b3dc3879a1b9dc72d64f0c0ed6b3aae42/ +Author: Shoichi Tamuki <tam...@linet.gr.jp> +Acked-By: Mattia Rizzolo <mat...@debian.org> + +--- a/interface/x_sherry.c ++++ b/interface/x_sherry.c +@@ -781,8 +781,7 @@ + + static void png_read_func(png_structp png_ptr, char *buff, size_t n) + { +- struct timidity_file *tf; +- tf = (struct timidity_file *)png_ptr->io_ptr; ++ struct timidity_file *tf = png_get_io_ptr(png_ptr); + tf_read(buff, 1, n, tf); + } + +@@ -909,7 +908,11 @@ + { + if(png_get_valid(pngPtr, infoPtr, PNG_INFO_hIST)) + png_get_hIST(pngPtr, infoPtr, &hist); ++#if PNG_LIBPNG_VER >= 10402 ++ png_set_quantize(pngPtr, palette, ++#else + png_set_dither(pngPtr, palette, ++#endif + numPalette, MAX_SCREEN_COLORS, hist, 1); + } + } +@@ -934,13 +937,14 @@ + } + } + } ++#if PNG_LIBPNG_VER >= 10402 ++ png_set_quantize(pngPtr, stdColorCube, ++#else + png_set_dither(pngPtr, stdColorCube, ++#endif + 6*7*6, MAX_SCREEN_COLORS, + NULL, 1); +- /*???*/ +- png_set_PLTE(pngPtr, infoPtr, pngPtr->palette, pngPtr->num_palette); +- palette = pngPtr->palette; +- numPalette = pngPtr->num_palette; ++ png_get_PLTE(pngPtr, infoPtr, &palette, &numPalette); + } + + if(png_get_valid(pngPtr, infoPtr, PNG_INFO_tRNS)) diff -Nru timidity-2.13.2/debian/patches/series timidity-2.13.2/debian/patches/series --- timidity-2.13.2/debian/patches/series 2015-12-23 19:14:22.000000000 +0000 +++ timidity-2.13.2/debian/patches/series 2016-04-07 14:00:11.000000000 +0000 @@ -1,2 +1,3 @@ debian-changes-2.13.2-36 find_-perm_+.diff +libpng1.5.patch diff -Nru timidity-2.13.2/debian/timidity.docs timidity-2.13.2/debian/timidity.docs --- timidity-2.13.2/debian/timidity.docs 2008-12-29 10:04:47.000000000 +0000 +++ timidity-2.13.2/debian/timidity.docs 2016-04-07 14:03:48.000000000 +0000 @@ -1,5 +1,5 @@ AUTHORS -README NEWS +README doc/C/README* doc/ja_JP.eucJP/README* diff -Nru timidity-2.13.2/debian/timidity.install timidity-2.13.2/debian/timidity.install --- timidity-2.13.2/debian/timidity.install 2009-07-17 07:51:29.000000000 +0000 +++ timidity-2.13.2/debian/timidity.install 2016-04-07 14:03:48.000000000 +0000 @@ -1,7 +1,7 @@ +etc/X11 +etc/default +etc/timidity/timidity.cfg usr/bin usr/lib/timidity/bitmaps usr/share/man usr/share/pixmaps -etc/X11 -etc/timidity/timidity.cfg -etc/default diff -Nru timidity-2.13.2/debian/timidity-interfaces-extra.install timidity-2.13.2/debian/timidity-interfaces-extra.install --- timidity-2.13.2/debian/timidity-interfaces-extra.install 2008-12-29 09:29:51.000000000 +0000 +++ timidity-2.13.2/debian/timidity-interfaces-extra.install 2016-04-07 14:03:48.000000000 +0000 @@ -1,4 +1,3 @@ -usr/lib/timidity/interface_[skTig]* usr/lib/timidity/*tcl* +usr/lib/timidity/interface_[skTig]* usr/share/applications/timidity-interfaces-extra.desktop -
signature.asc
Description: PGP signature
