--- zinf-2.2.5.orig/base/include/queue.h +++ zinf-2.2.5/base/include/queue.h @@ -24,6 +24,8 @@ #ifndef INCLUDED_QUEUE_H_ #define INCLUDED_QUEUE_H_ +#include + #include "config.h" #include "mutex.h" --- zinf-2.2.5.orig/base/include/player.h +++ zinf-2.2.5/base/include/player.h @@ -155,13 +155,13 @@ #define _EQUALIZER_ENABLE_ #ifdef _EQUALIZER_ENABLE_ - void Player::SetEQData(Event *pEvent); + void SetEQData(Event *pEvent); #endif // _EQUALIZER_ENABLE_ #undef _EQUALIZER_ENABLE_ #define _VISUAL_ENABLE_ #ifdef _VISUAL_ENABLE_ - void Player::SendVisBuf(Event *pEvent); + void SendVisBuf(Event *pEvent); #endif // _VISUAL_ENABLE_ #undef _VISUAL_ENABLE_ --- zinf-2.2.5.orig/debian/autotools-files.mk +++ zinf-2.2.5/debian/autotools-files.mk @@ -0,0 +1,73 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters +# Description: A class to automatically update GNU autotools files +# +# 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, 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 +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_autotools_files +_cdbs_class_autotools_files := 1 + +include $(_cdbs_class_path)/autotools-vars.mk$(_cdbs_makefile_suffix) + +common-configure-arch common-configure-indep:: debian/stamp-autotools-files +debian/stamp-autotools-files: + if test "$(DEB_AUTO_UPDATE_LIBTOOL)" = "pre" ; then \ + cd $(DEB_SRCDIR) && libtoolize -c -f ; \ + fi + if test -n "$(DEB_AUTO_UPDATE_AUTOMAKE)" ; then \ + if test -d $(DEB_SRCDIR)/m4 ; then m4="-I m4" ; fi ; \ + if test -e $(DEB_SRCDIR)/aclocal.m4 ; then cd $(DEB_SRCDIR) && aclocal-$(DEB_AUTO_UPDATE_AUTOMAKE) $$m4 ; fi ; \ + fi + if test -n "$(DEB_AUTO_UPDATE_AUTOCONF)" ; then \ + if test "$(DEB_AUTO_UPDATE_AUTOCONF)" = "2.50" ; then ac_suffix="" ; else ac_suffix="$(DEB_AUTO_UPDATE_AUTOCONF)" ; fi ; \ + if test -e $(DEB_SRCDIR)/configure.ac || test -e $(DEB_SRCDIR)/configure.in ; then cd $(DEB_SRCDIR) && autoconf$(ac_suffix) ; fi \ + fi + if test -n "$(DEB_AUTO_UPDATE_AUTOMAKE)" ; then \ + if test -e $(DEB_SRCDIR)/Makefile.am ; then cd $(DEB_SRCDIR) && automake-$(DEB_AUTO_UPDATE_AUTOMAKE) ; fi ; \ + fi + if [ -r "$(DEB_AC_AUX_DIR)/config.sub" -a ! -f "$(DEB_AC_AUX_DIR)/config.sub.cdbs-orig" -a -r /usr/share/misc/config.sub ] && ! cmp -s "$(DEB_AC_AUX_DIR)/config.sub" /usr/share/misc/config.sub; then \ + mv "$(DEB_AC_AUX_DIR)/config.sub" "$(DEB_AC_AUX_DIR)/config.sub.cdbs-orig"; \ + cp -f /usr/share/misc/config.sub "$(DEB_AC_AUX_DIR)/config.sub"; \ + fi + if [ -r "$(DEB_AC_AUX_DIR)/config.guess" -a ! -f "$(DEB_AC_AUX_DIR)/config.guess.cdbs-orig" -a -r /usr/share/misc/config.guess ] && ! cmp -s "$(DEB_AC_AUX_DIR)/config.guess" /usr/share/misc/config.guess; then \ + mv "$(DEB_AC_AUX_DIR)/config.guess" "$(DEB_AC_AUX_DIR)/config.guess.cdbs-orig"; \ + cp -f /usr/share/misc/config.guess "$(DEB_AC_AUX_DIR)/config.guess"; \ + fi + if test "$(DEB_AUTO_UPDATE_LIBTOOL)" = "post" ; then \ + if test -e $(DEB_SRCDIR)/libtool ; then cp -f /usr/bin/libtool $(DEB_SRCDIR)/libtool ; fi ; \ + fi + touch debian/stamp-autotools-files + +clean:: + if [ -r "$(DEB_AC_AUX_DIR)/config.sub.cdbs-orig" ]; then \ + mv "$(DEB_AC_AUX_DIR)/config.sub.cdbs-orig" "$(DEB_AC_AUX_DIR)/config.sub"; \ + fi + if [ -r "$(DEB_AC_AUX_DIR)/config.guess.cdbs-orig" ]; then \ + mv "$(DEB_AC_AUX_DIR)/config.guess.cdbs-orig" "$(DEB_AC_AUX_DIR)/config.guess"; \ + fi + if [ -f "$(DEB_BUILDDIR)/config.log" ] && grep -i 'generated.*by.*autoconf' "$(DEB_BUILDDIR)/config.log" 1>/dev/null; then \ + rm -f "$(DEB_BUILDDIR)/config.log"; \ + fi + rm -f debian/stamp-autotools-files + +endif --- zinf-2.2.5.orig/debian/changelog +++ zinf-2.2.5/debian/changelog @@ -0,0 +1,296 @@ +zinf (2.2.5-5.2) unstable; urgency=low + + * NMU as part of the GCC 4.1 transition. + * Remove extra qualification from a C++ header file and include cassert + so assert is defined (closes: #355990). + + -- Martin Michlmayr Thu, 25 May 2006 21:26:52 +0200 + +zinf (2.2.5-5.1) unstable; urgency=low + + * Non-maintainer upload. + * C++ transition: rebuild against current libc6-dev, libartsc0-dev, + libmusicbrainz4-dev, and libid3-3.8.3-dev. + * Xorg transition: build-depend on x-dev instead of xlibs-dev. (Upstream + uses X11/Xatom.h in ui/zinf/unix/src/GTKUtility.cpp but does not check for + X11 development files in configure.ac with AC_PATH_X or AC_PATH_XTRA). + * Drop useless liborbit2-dev and libgtkmm2.0-dev build dependencies. + + -- Loic Minier Wed, 14 Sep 2005 17:52:51 +0200 + +zinf (2.2.5-5) unstable; urgency=low + + * Applied patch which fixes excessive memory consumtion when compiling + Theme.cpp (closes: #271645). + * debian/control: Added amd64 to the libasound2-dev build-dependency + arch list and use -O0 when compiling on amd64 to work around compiler + bug (closes: #277831). + + -- Andreas Rottmann Sat, 30 Oct 2004 13:50:06 +0200 + +zinf (2.2.5-4) unstable; urgency=low + + * Rebuilt against libmusicbrainz4-dev. + * Fixed debian/itla-debuild.mk, closes: #254517. + + -- Andreas Rottmann Sat, 7 Aug 2004 14:03:43 +0200 + +zinf (2.2.5-3) unstable; urgency=low + + * First release of *anything* *ever* built with itla-debuild. + * Upstream fixes: + - head--patch-1: Applied patch rtp:// URL parsing patch from + Samuel Thibault (thanks!), closes: #222301. + Plus patch-1 from kris's zinf--fixes--2.2.5 branch. + * debian/itla-debuild.mk: CDBS rules for the itla-debuild-generated + patch script. + * debian/autotools-files.mk: Fixes CDBS bug #235961. + * debian/rules: + - Use CDBS autoconf/make auto-update. + - Include fixed autotools-files.mk, itla-debuild.mk. + * debian/rules: Build-Depend on autoconf, automake, libtool. + * debian/zinf.menu: Fixed lintian warning unquoted-string-in-menu-item. + * debian/zinf.desktop: Fixed icon path. + + -- Andreas Rottmann Thu, 4 Mar 2004 22:41:18 +0100 + +zinf (2.2.5-2) unstable; urgency=low + + * Make debian/dh_shlibdeps executable before build, closes: #233542. + + -- Andreas Rottmann Wed, 18 Feb 2004 17:46:54 +0100 + +zinf (2.2.5-1) unstable; urgency=low + + * New upstream release. + - Fixed URL parsing, closes: #205083. + - A couple of startup bug fixed, closes: #205333, #164517, #206925. + - Now is compatible with new ALSA headers, closes: #229323. + - No longer uses Freetype, closes: #85066, #206927. + - Now defaults to hardware volume control, closes: #164111. + - No more screen flicker after music search, closes: #125394. + - Has extra skipping keystrokes in cmdline UI, closes: #100458. + * Standards-Version: 3.6.1 (no changes). + * Include and use CDBS debhelper.mk to facilitate use of patched + dh_shlibpdeps. + + -- Andreas Rottmann Tue, 17 Feb 2004 11:52:22 +0100 + +zinf (2.2.4-6) unstable; urgency=low + + * debian/rules: Fixed for arch-only builds (closes: #207213). + + -- Andreas Rottmann Mon, 25 Aug 2003 19:58:41 +0200 + +zinf (2.2.4-5) unstable; urgency=low + + * Only include relevant READMEs (closes: #206924). + * Updated debian/rules for current cdbs (0.4.5.3). + - Don't the symlink the doc directories of the zinf-extra, zinf-plugin-* + to the zinf doc directory anymore, since current CDBS makes that + hard to do. + - Versioned the build dependency on cdbs. + * Moved from explicitly specifying stricter dependency on + libttf2 in debian/control to doing this via debian/shlibs.local. + + -- Andreas Rottmann Mon, 25 Aug 2003 15:14:20 +0200 + +zinf (2.2.4-4) unstable; urgency=low + + * Fixes provided by Goswin von Brederlow (thanks!): + - 64 Bit cleanup (related to bug #134414? but the strace was a libttf bug). + - Build-depend on libttf2 (>= 1.4pre.20030402-1) to prevent crashes on + alpha and others (closes: #134414, closes: #168587). + - Changed the failure message strangely appearing on the first start to + tell people to retry (workaround for bug #163517). + * Make dh_shlibdeps consider the plugins (closes: #204287). + - I include and use a modified version of dh_shlibdeps, until patch + (see #204633) is integrated upstream. + * Tighten depends of plugin packages on zinf. + + -- Andreas Rottmann Fri, 8 Aug 2003 23:46:57 +0200 + +zinf (2.2.4-3) unstable; urgency=low + + * Drop dpatch, as I now have upstream CVS write access and don't + need a fancy patch system anymore ;-). + * Fix some bigendian issues (causing build failures). + + -- Andreas Rottmann Wed, 6 Aug 2003 15:05:31 +0200 + +zinf (2.2.4-2) unstable; urgency=low + + * Added libgdbm-dev to build depends (closes: #204319). + + -- Andreas Rottmann Wed, 6 Aug 2003 10:51:44 +0200 + +zinf (2.2.4-1) unstable; urgency=low + + * New upstream release (closes: #188073). + - Now uses automake and libtool (closes: #188923). + - Obsoletes all patches. + - Seems to fix mp3 stream crash (closes: #160710). + - Does not come with an EMP/RMP plugin anymore (closes: #164518, #185815). + - Fixes URL handling (closes: #167527, #192360). + - Seems to fix GTK+ errorrs (closes: #198931). + - cmdline UI displays error message if file not found (closes: #75480). + * Updated copyright file (closes: #188072). + * Providing a MIME file for zinf. + * Added MimeTypes entry to the .desktop file. + + -- Andreas Rottmann Tue, 5 Aug 2003 14:27:33 +0200 + +zinf (2.2.2+cvs20030131+dp1-4) unstable; urgency=low + + * New patch: 03_xingmp3-bigendian.dpatch - thanks to Neil Schemenauer + (closes: #56472). + + -- Andreas Rottmann Thu, 3 Apr 2003 18:43:11 +0200 + +zinf (2.2.2+cvs20030131+dp1-3) unstable; urgency=low + + * New patch: 05_id3lib-fixes.dpatch - fixes id3lib configure + check (closes: #185638). + + -- Andreas Rottmann Thu, 20 Mar 2003 21:58:40 +0100 + +zinf (2.2.2+cvs20030131+dp1-2) unstable; urgency=low + + * Enhanced the package descriptions as suggested by Ben Burton + (closes: #185401). + * zinf now also suggests the aRts plugin. + * Bumped build dependencies on libmusicbrainz-dev and libid3-3.8.2-dev + to libmusicbrainz2-dev and libid3-3.8.3-dev, respectivly. + * Standards-Version 3.5.9. + + -- Andreas Rottmann Wed, 19 Mar 2003 09:48:35 +0100 + +zinf (2.2.2+cvs20030131+dp1-1) unstable; urgency=low + + * Replaced themes in the tarball with the ones from + current CVS (closes: #170402). + * Fix build-dependency on libarts-dev (closes: #184720). + * Build arts plugin - new package zinf-plugin-arts (closes: #178855). + * Removed dh_undocumented invocation. + + -- Andreas Rottmann Sun, 16 Mar 2003 16:20:35 +0100 + +zinf (2.2.2+cvs20030131-2) unstable; urgency=low + + * Bump build-depend on libmusicbrainz-dev to g++ 3.2 compiled version. + + -- Andreas Rottmann Fri, 31 Jan 2003 18:36:31 +0100 + +zinf (2.2.2+cvs20030131-1) unstable; urgency=low + + * New upstream CVS snapshot. + + Vorbis tag goofup fixed (closes: #178320). + + -- Andreas Rottmann Thu, 30 Jan 2003 21:27:40 +0100 + +zinf (2.2.2+cvs20030126-1) unstable; urgency=low + + * New upstream CVS snapshot. + + Make a clean snapshot. + * Created a clean diff, should fix build (closes: #178425). + + -- Andreas Rottmann Sun, 26 Jan 2003 14:37:52 +0100 + +zinf (2.2.2+cvs20030119-2) unstable; urgency=low + + * debian/control: Added autotools-dev to build-depends. + + -- Andreas Rottmann Fri, 24 Jan 2003 19:38:34 +0100 + +zinf (2.2.2+cvs20030119-1) unstable; urgency=low + + * New upstream release (from CVS). + + Volume-resetting bug seems fixed (closes: #142286) + + ID3v2 tags should be read al#178320ways now (closes: #175869) + + NEWS updated (closes: #174100) + * Drop dbs into the flames, in favor of dpatch. + + -- Andreas Rottmann Fri, 24 Jan 2003 11:00:23 +0100 + +zinf (2.2.1+cvs20021218-1) unstable; urgency=low + + * New upstream release (from CVS). + + NCurses UI now functional it seems (closes: #74674). + + -- Andreas Rottmann Thu, 19 Dec 2002 13:01:44 +0100 + +zinf (2.2.0+cvs20020912-3) unstable; urgency=low + + * Build-Depend on autoconf2.13 instead of autoconf (hopefully fixes + build). + + -- Andreas Rottmann Tue, 17 Sep 2002 16:39:18 +0200 + +zinf (2.2.0+cvs20020912-2) unstable; urgency=low + + * Added patch to dynamically link id3v2 plugin against id3lib. + * Build-Depend on autoconf and invoke it before configuring, since + we patch configure.in. + * Bug review (by upstream, thanks kris@cs.ucsb.edu): + + Relatable stuff was removed (closes: #97992). + + zinf honours $BROWSER (closes: #106615, #106616). + + -- Andreas Rottmann Tue, 17 Sep 2002 15:24:08 +0200 + +zinf (2.2.0+cvs20020912-1) unstable; urgency=low + + * New upstream release (from CVS) + + Uses ALSA 0.9 (closes: #159914) + + TextUI preference is generated correctly (closes: #159367) + * Now using DBS. + * config.guess & config.sub updated (closes: #160115). + * debian/control: Standards-Version: 0.5.7 + * Old freeamp bug review: + + .ogg playback seems to work ok now (closes: #110295) + + Watch directory bug seems to be gone (closes: #142355) + + -- Andreas Rottmann Thu, 12 Sep 2002 14:57:30 +0200 + +zinf (2.2.0-6) unstable; urgency=low + + * debian/control: s/m86k/m68k/g. + + -- Andreas Rottmann Sat, 7 Sep 2002 02:22:31 +0200 + +zinf (2.2.0-5) unstable; urgency=low + + * Include simple man page (closes: #126235). + * Include menu entry (closes: #158526). + * Fixed gnome .desktop file directory. + * debian/control: fix typo in libasound1-dev build-dependency archs. + + -- Andreas Rottmann Thu, 5 Sep 2002 16:27:49 +0200 + +zinf (2.2.0-4) unstable; urgency=low + + * plm/metadata/id3v2/io_helpers.cc: Try fix compilation for alpha (and + probably others). + + -- Andreas Rottmann Mon, 26 Aug 2002 20:03:13 +0200 + +zinf (2.2.0-3) unstable; urgency=low + + * plm/metadata/id3v2/io_strings.h: Added casts for min(). (should fix + build problems on alpha). + + -- Andreas Rottmann Mon, 26 Aug 2002 17:32:07 +0200 + +zinf (2.2.0-2) unstable; urgency=low + + * debian/rules: Added missing '\' in configure line. + * debian/control: Fixed libasound1-dev build-dependency archs, + added build-dependeny on liborbit-dev. + + -- Andreas Rottmann Mon, 26 Aug 2002 15:30:21 +0200 + +zinf (2.2.0-1) unstable; urgency=low + + * Initial Release. + + -- Andreas Rottmann Fri, 16 Aug 2002 11:43:40 +0200 + --- zinf-2.2.5.orig/debian/control +++ zinf-2.2.5/debian/control @@ -0,0 +1,82 @@ +Source: zinf +Section: sound +Priority: optional +Maintainer: Andreas Rottmann +Standards-Version: 3.6.1 +Build-Depends: debhelper (>> 4), cdbs (>= 0.4.5.3), automake1.8, autoconf, libtool, autotools-dev, liborbit-dev, libxosd-dev, libglib2.0-dev, libgtk2.0-dev, libncurses5-dev, libesd0-dev, libartsc0-dev, libasound2-dev [alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc amd64], nasm [i386], libmusicbrainz4-dev, libid3-3.8.3-dev, libvorbis-dev (>= 1.0.0), libgdbm-dev, zlib1g-dev, x-dev, libboost-dev + +Package: zinf +Architecture: any +Depends: ${shlibs:Depends} +Conflicts: freeamp +Replaces: freeamp +Suggests: zinf-extras, zinf-plugin-esound, zinf-plugin-alsa, zinf-plugin-arts +Description: Extensible, cross-platform audio player + ZINF - ZINF is not FreeA*p. + . + ZINF is an extensible, cross-platform audio player. It features an + optimized version of the GPLed Xing MPEG decoder which makes it one + of the fastest and best sounding players available. ZINF provides a + number of the most common features users have come to expect in a + clean, easy to use interface. Some of the these features are: + . + o Plays all MPEG 1, MPEG 2, and MPEG 2.5 encoded files. + o Support for Vorbis + o Support for Xing's Variqable Bitrate Encoding Technology. + o Play songs over the Internet through HTTP unicast streaming (ShoutCast), + or RTP multicast streaming (Obsequiem). + o Supports IceCast style title streaming. + o Save ShoutCast and IceCast streams locally to your computer for offline + listening... + o A powerful music browser and playlisqt editor. + o A built in download manager which supports downloading files from sites + using the RMP (RealJukebox) download process. + o User defined prebuffering for slower machines. + o Enlightened Sound Daemon support + +Package: zinf-extras +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, zinf (= ${Source-Version}) +Conflicts: freeamp-extras +Replaces: freeamp-extras +Suggests: zinf-plugin-esound, zinf-plugin-alsa +Description: Additional ncurses and command line user interfaces + Extra plugins (mpg123 ui, cmdline ui, ncurses ui, irman, lcd) for + ZINF. + . + ZINF is an extensible, cross-platform audio player. For more + information, please see the zinf package. + +Package: zinf-plugin-esound +Architecture: any +Depends: ${shlibs:Depends}, zinf (= ${Source-Version}) +Conflicts: libfreeamp-esound +Replaces: libfreeamp-esound +Description: EsounD plugin for ZINF + Enlightened Sound Daemon support plugin for ZINF. + . + ZINF is an extensible, cross-platform audio player. For more + information, please see the zinf package. + +Package: zinf-plugin-alsa +Architecture: alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc +Priority: extra +Conflicts: libfreeamp-alsa +Replaces: libfreeamp-alsa +Depends: ${shlibs:Depends}, zinf (= ${Source-Version}) +Description: ALSA plugin for ZINF + Advanced Linux Sound Architecture plugin or ZINF. + . + ZINF is an extensible, cross-platform audio player. For more + information, please see the zinf package. + +Package: zinf-plugin-arts +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, zinf (= ${Source-Version}) +Description: aRts plugin for ZINF + aRts (soundserver used by KDE) ouput plugin for ZINF. + . + ZINF is an extensible, cross-platform audio player. For more + information, please see the zinf package. --- zinf-2.2.5.orig/debian/copyright +++ zinf-2.2.5/debian/copyright @@ -0,0 +1,10 @@ +This package was initially debianized by Ben Gertzfield on +Mon, 6 Jul 1998 16:16:26 -0700 + +It was then adopted by Andreas Rottmann . + +Zinf was downloaded from http://www.zinf.org/download.php + +Zinf is released under the GNU General Public License, version 2 +or later, found on Debian GNU/Linux systems in the file +/usr/share/common-licenses/GPL --- zinf-2.2.5.orig/debian/debhelper.mk +++ zinf-2.2.5/debian/debhelper.mk @@ -0,0 +1,213 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters +# Description: Uses Debhelper to implement the binary package building stage +# Note that we require debhelper (>= 4.1.0). +# +# 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, 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 +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +#### +# General variables implemented by this rule file: +# +# DEB_INSTALL_DIRS_ALL +# Subdirectories to create in installation staging directory for every package +# DEB_INSTALL_DIRS_ +# Like the above, but for a particular package . +# DEB_INSTALL_DOCS_ALL +# Files which should go in /usr/share/doc/ for every package +# DEB_INSTALL_DOCS_ +# Files which should go in /usr/share/doc/ for package +# DEB_INSTALL_CHANGELOGS_ALL +# File which should be interpreted as upstream changelog +# DEB_COMPRESS_EXCLUDE +# Shell wildcards matching files which should not be compressed. +# DEB_FIXPERMS_EXCLUDE +# Shell wildcards matching files which should not have their permissions changed. +# DEB_SHLIBDEPS_LIBRARY_package +# The name of the current library package +# DEB_SHLIBDEPS_INCLUDE +# A space-separated list of library paths to search for dependency info +# DEB_SHLIBDEPS_INCLUDE_package +# Like the above, but for a particular package. +# DEB_PERL_INCLUDE +# A space-separated list of paths to search for perl modules +# DEB_PERL_INCLUDE_package +# Like the above, but for a particular package. +# DEB_UPDATE_RCD_PARAMS +# Arguments to pass to update-rc.d in init scripts +#### +# Special variables used by this rule file: +# +# DEB_DH_MAKESHLIBS_ARGS_ALL +# Arguments passed directly to dh_makeshlibs, for all packages +# DEB_DH_MAKESHLIBS_ARGS_ +# Arguments passed directly to dh_makeshlibs, for a particular package +# DEB_DH_MAKESHLIBS_ARGS +# Completely override argument passing to dh_makeshlibs. +# DEB_DH_SHLIBDEPS_ARGS +# Completely override argument passing to dh_shlibdeps. +# DEB_DH_PERL_ARGS +# Completely override argument passing to dh_perl. +#### + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_rules_debhelper +_cdbs_rules_debhelper := 1 + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +DH_COMPAT=4 + +is_debug_package=$(if $(patsubst %-dbg,,$(cdbs_curpkg)),,yes) + +DEB_INSTALL_DIRS_ALL = +DEB_INSTALL_CHANGELOGS_ALL = $(if $(DEB_ISNATIVE),,$(shell for f in ChangeLog Changelog Changes CHANGES; do if test -s $(DEB_SRCDIR)/$$f; then echo $(DEB_SRCDIR)/$$f; break; fi; done)) +DEB_INSTALL_DOCS_ALL = $(filter-out $(DEB_INSTALL_CHANGELOGS_ALL),$(shell for f in README NEWS TODO BUGS AUTHORS THANKS; do if test -s $(DEB_SRCDIR)/$$f; then echo $(DEB_SRCDIR)/$$f; fi; done)) + +cdbs_add_dashx = $(foreach i,$(1),$(patsubst %,-X %,$(i))) + +DEB_DH_MAKESHLIBS_ARGS = $(DEB_DH_MAKESHLIBS_ARGS_ALL) $(DEB_DH_MAKESHLIBS_ARGS_$(cdbs_curpkg)) +DEB_DH_SHLIBDEPS_ARGS = $(if $(DEB_SHLIBDEPS_LIBRARY_$(cdbs_curpkg)),-L $(DEB_SHLIBDEPS_LIBRARY_$(cdbs_curpkg))) $(if $(DEB_SHLIBDEPS_INCLUDE_$(cdbs_curpkg))$(DEB_SHLIBDEPS_INCLUDE),-l $(shell echo $(DEB_SHLIBDEPS_INCLUDE_$(cdbs_curpkg)):$(DEB_SHLIBDEPS_INCLUDE) | perl -pe 's/ /:/g;')) + +DEB_DH_PERL_ARGS = $(if $(DEB_PERL_INCLUDE_$(cdbs_curpkg))$(DEB_PERL_INCLUDE),$(shell echo $(DEB_PERL_INCLUDE_$(cdbs_curpkg)) $(DEB_PERL_INCLUDE))) + +pre-build:: + if [ -z "$(DEB_DH_COMPAT_DISABLE)" ]; then \ + if ! test -f debian/compat; then echo $(DH_COMPAT) > debian/compat; fi; \ + fi + +clean:: + dh_clean + +common-install-prehook-arch common-install-prehook-indep:: common-install-prehook-impl +common-install-prehook-impl:: + dh_clean -k + dh_installdirs -A $(DEB_INSTALL_DIRS_ALL) + +$(patsubst %,install/%,$(DEB_ALL_PACKAGES)) :: install/%: + dh_installdirs -p$(cdbs_curpkg) $(DEB_INSTALL_DIRS_$(cdbs_curpkg)) + +# Create .debs or .udebs as we see fit +$(patsubst %,binary/%,$(DEB_PACKAGES)) :: binary/% : binary-makedeb/% +$(patsubst %,binary/%,$(DEB_UDEB_PACKAGES)) :: binary/% : binary-makeudeb/% + +#### +# General Debian package creation rules. +#### + +# This rule is called once for each (non-udeb) package. It does the work +# of installing to debian/; this includes running +# dh_install to split the source from debian/tmp, as well as installing +# ChangeLogs and the like. +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + dh_link -p$(cdbs_curpkg) $(DEB_DH_LINK_ARGS) + dh_installdocs -p$(cdbs_curpkg) $(DEB_INSTALL_DOCS_ALL) $(DEB_INSTALL_DOCS_$(cdbs_curpkg)) + dh_installexamples -p$(cdbs_curpkg) $(DEB_INSTALL_EXAMPLES_$(cdbs_curpkg)) + dh_installman -p$(cdbs_curpkg) $(DEB_INSTALL_MANPAGES_$(cdbs_curpkg)) + dh_installinfo -p$(cdbs_curpkg) $(DEB_INSTALL_INFO_$(cdbs_curpkg)) + dh_installmenu -p$(cdbs_curpkg) $(DEB_DH_INSTALL_MENU_ARGS) + dh_installcron -p$(cdbs_curpkg) $(DEB_DH_INSTALL_CRON_ARGS) + dh_installinit -p$(cdbs_curpkg) $(if $(DEB_UPDATE_RCD_PARAMS),--update-rcd-params=$(DEB_UPDATE_RCD_PARAMS),$(if $(DEB_UPDATE_RCD_PARAMS_$(cdbs_curpkg)),--update-rcd-params=$(DEB_UPDATE_RCD_PARAMS_$(cdbs_curpkg)))) $(DEB_DH_INSTALLINIT_ARGS) + dh_installdebconf -p$(cdbs_curpkg) $(DEB_DH_INSTALLDEBCONF_ARGS) + dh_installemacsen -p$(cdbs_curpkg) $(if $(DEB_EMACS_PRIORITY),--priority=$(DEB_EMACS_PRIORITY)) $(if $(DEB_EMACS_FLAVOR),--flavor=$(DEB_EMACS_FLAVOR)) $(DEB_DH_INSTALLEMACSEN_ARGS) + dh_installpam -p$(cdbs_curpkg) $(DEB_DH_INSTALLPAM_ARGS) + dh_installlogrotate -p$(cdbs_curpkg) $(DEB_DH_INSTALLLOGROTATE_ARGS) + if test -x /usr/bin/dh_installlogcheck; then dh_installlogcheck -p$(cdbs_curpkg) $(DEB_DH_INSTALLLOGCHECK_ARGS); fi + dh_installchangelogs -p$(cdbs_curpkg) $(DEB_DH_INSTALLCHANGELOGS_ARGS) $(DEB_INSTALL_CHANGELOGS_ALL) $(DEB_INSTALL_CHANGELOGS_$(cdbs_curpkg)) + dh_install -p$(cdbs_curpkg) $(if $(DEB_DH_INSTALL_SOURCEDIR),--sourcedir=$(DEB_DH_INSTALL_SOURCEDIR)) $(DEB_DH_INSTALL_ARGS) + dh_link -p$(cdbs_curpkg) $(DEB_DH_LINK_ARGS) + +# This rule is called after all packages have been installed, and their +# post-install hooks have been run. +common-binary-post-install-arch:: $(patsubst %,binary-post-install/%,$(DEB_ARCH_REGULAR_PACKAGES)) +common-binary-post-install-indep:: $(patsubst %,binary-post-install/%,$(DEB_INDEP_REGULAR_PACKAGES)) + +# This rule is called once for each package; it's a general hook +# to do things like remove files, etc. +$(patsubst %,binary-post-install/%,$(DEB_PACKAGES)) :: binary-post-install/%: binary-install/% + +# This rule is called after installation and the post-install hooks, +# to strip files. +$(patsubst %,binary-strip/%,$(DEB_ARCH_REGULAR_PACKAGES)) :: binary-strip/%: common-binary-post-install-arch binary-strip-IMPL/% +$(patsubst %,binary-strip/%,$(DEB_INDEP_REGULAR_PACKAGES)) :: binary-strip/%: common-binary-post-install-indep binary-strip-IMPL/% +$(patsubst %,binary-strip-IMPL/%,$(DEB_PACKAGES)) :: binary-strip-IMPL/%: + if test "$(is_debug_package)"; then :; else dh_strip -p$(cdbs_curpkg) $(foreach entry,$(DEB_STRIP_EXCLUDE),$(patsubst %,-X %,$(entry))) $(DEB_DH_STRIP_ARGS); fi + +# This rule is called after stripping; it compresses, fixes permissions, +# and sets up shared library information. +$(patsubst %,binary-fixup/%,$(DEB_PACKAGES)) :: binary-fixup/%: binary-strip/% + dh_compress -p$(cdbs_curpkg) $(foreach entry,$(DEB_COMPRESS_EXCLUDE),$(patsubst %,-X %,$(entry))) $(DEB_DH_COMPRESS_ARGS) + dh_fixperms -p$(cdbs_curpkg) $(foreach entry,$(DEB_FIXPERMS_EXCLUDE),$(patsubst %,-X %,$(entry))) $(DEB_DH_FIXPERMS_ARGS) + if test "$(is_debug_package)"; then :; else dh_makeshlibs -p$(cdbs_curpkg) $(DEB_DH_MAKESHLIBS_ARGS); fi + +# This rule is called right before building the binary .deb packages +# for each package, but after the binary-predeb hooks have been run. +common-binary-predeb-arch:: $(patsubst %,binary-predeb/%,$(DEB_ARCH_REGULAR_PACKAGES)) +common-binary-predeb-indep:: $(patsubst %,binary-predeb/%,$(DEB_INDEP_REGULAR_PACKAGES)) + +# This rule is called right before a packages' .deb file is made. +# It is a good place to make programs setuid, change the scripts in DEBIAN/, etc. +$(patsubst %,binary-predeb/%,$(DEB_PACKAGES)) :: binary-predeb/%: binary-fixup/% + dh_installdeb -p$(cdbs_curpkg) $(DEB_DH_INSTALLDEB_ARGS) + dh_perl -p$(cdbs_curpkg) $(DEB_DH_PERL_ARGS) + +# This rule is called to create a package. Generally it's not going to be +# useful to hook things onto this rule. +$(patsubst %,binary-makedeb/%,$(DEB_ARCH_REGULAR_PACKAGES)) :: binary-makedeb/% : common-binary-predeb-arch binary-makedeb-IMPL/% +$(patsubst %,binary-makedeb/%,$(DEB_INDEP_REGULAR_PACKAGES)) :: binary-makedeb/% : common-binary-predeb-indep binary-makedeb-IMPL/% +$(patsubst %,binary-makedeb-IMPL/%,$(DEB_PACKAGES)) :: binary-makedeb-IMPL/% : + debian/dh_shlibdeps -p$(cdbs_curpkg) $(DEB_DH_SHLIBDEPS_ARGS) + dh_gencontrol -p$(cdbs_curpkg) $(DEB_DH_GENCONTROL_ARGS) + dh_md5sums -p$(cdbs_curpkg) $(DEB_DH_MD5SUMS_ARGS) + dh_builddeb -p$(cdbs_curpkg) $(DEB_DH_BUILDDEB_ARGS) + +## Deprecated +common-binary-post-install:: common-binary-post-install-arch common-binary-post-install-indep +common-binary-predeb:: common-binary-predeb-arch common-binary-predeb-indep + +#### +# The special .udeb building rules. Note they don't handle the arch/indep +# split yet. +#### + +$(patsubst %,binary-install-udeb/%,$(DEB_UDEB_PACKAGES)) :: binary-install-udeb/%: + dh_installcron -p$(cdbs_curpkg) $(DEB_DH_INSTALLCRON_ARGS) + dh_installdebconf -p$(cdbs_curpkg) $(DEB_DH_INSTALLDEBCONF_ARGS) + dh_installpam -p$(cdbs_curpkg) $(DEB_DH_INSTALLPAM_ARGS) + dh_installinit -p$(cdbs_curpkg) $(DEB_DH_INSTALLINIT_ARGS) + dh_install -p$(cdbs_curpkg) $(DEB_DH_INSTALL_ARGS) + +common-binary-post-install-udeb:: $(patsubst %,binary-post-install-udeb/%,$(DEB_UDEB_PACKAGES)) + +$(patsubst %,binary-post-install-udeb/%,$(DEB_UDEB_PACKAGES)) :: binary-post-install-udeb/%: binary-install-udeb/% + +$(patsubst %,binary-makeudeb/%,$(DEB_UDEB_PACKAGES)) :: binary-makeudeb/% : common-binary-post-install-udeb + dh_strip -p$(cdbs_curpkg) $(foreach entry,$(DEB_STRIP_EXCLUDE),$(patsubst %,-X %,$(entry))) $(DEB_DH_STRIP_ARGS) + dh_compress -p$(cdbs_curpkg) $(foreach entry,$(DEB_COMPRESS_EXCLUDE),$(patsubst %,-X %,$(entry))) + dh_fixperms -p$(cdbs_curpkg) $(foreach entry,$(DEB_FIXPERMS_EXCLUDE),$(patsubst %,-X %,$(entry))) + dh_makeshlibs -p$(cdbs_curpkg) $(DEB_DH_MAKESHLIBS_ARGS) + dh_installdeb -p$(cdbs_curpkg) $(DEB_DH_INSTALLDEB_ARGS) + dh_perl -p$(cdbs_curpkg) $(DEB_DH_PERL_ARGS) + dh_shlibdeps -p$(cdbs_curpkg) $(DEB_DH_SHLIBDEPS_ARGS) + dh_gencontrol -p$(cdbs_curpkg) -- -fdebian/files~ + dpkg-distaddfile $(cdbs_curpkg)_$(DEB_VERSION)_$(DEB_ARCH).udeb debian-installer optional + dh_builddeb -p$(cdbs_curpkg) --filename=$(cdbs_curpkg)_$(DEB_VERSION)_$(DEB_ARCH).udeb + +endif --- zinf-2.2.5.orig/debian/dh_shlibdeps +++ zinf-2.2.5/debian/dh_shlibdeps @@ -0,0 +1,153 @@ +#!/usr/bin/perl -w + +=head1 NAME + +dh_shlibdeps - calculate shared library dependancies + +=cut + +use strict; +use Cwd; +use Debian::Debhelper::Dh_Lib; + +=head1 SYNOPSIS + +B [S>] [B<-L>I] [B<-l>I] [B<-X>I] [S I>] + +=head1 DESCRIPTION + +dh_shlibdeps is a debhelper program that is responsible for calculating +shared library dependancies for packages. + +This program is merely a wrapper around L that calls it +once for each package listed in the control file, passing it +a list of ELF executables and shared libraries it has found. + +=head1 OPTIONS + +=over 4 + +=item B<-u>I, B<--dpkg-shlibdeps-params=>I + +=item B<--> I + +Pass "params" to L. + +=item B<-X>I, B<--exclude=>I + +Exclude files that contain "item" anywhere in their filename from being +passed to dpkg-shlibdeps. This will make their dependancies be ignored. +This may be useful in some situations, but use it with caution. This option +may be used more than once to exclude more than one thing. + +=item B<-l>I[:directory:directory:..] + +Before dpkg-shlibdeps is run, LD_LIBRARY_PATH will have added to it the +specified directory (or directories -- separate with colons). This is +useful for multi-binary packages where a library is built in one +package and another package contains binaries linked against said +library. Relative paths will be made absolute for the benefit of +dpkg-shlibdeps. + +Note that the directory given should be the complete or relative path to +a directory that contains the library. See example below. + +=item B<-L>I, B<--libpackage=>I + +Use the shlibs file automatically generated by dh_makeshlibs for the named +package as a kind of automatically generated shlibs.local file. You can us +this switch in concert with the -l switch to make dpkg-shlibdeps find a +library built as part of the current package, and get the shlibs information. +See example below. + +=back + +=head1 EXAMPLES + +Suppose that your source package produces libfoo1, libfoo-dev, and +libfoo-bin binary packages. libfoo-bin links against libfoo1, and should +depend on it. In your rules file, first run dh_makeshlibs, then dh_shlibdeps: + + dh_makeshlibs + dh_shlibdeps -L libfoo1 -l debian/libfoo1/usr/lib + +This will have the effect of generating automatically a shlibs file for +libfoo1, and using that file and the libfoo1 library in the +debian/libfoo1/usr/lib directory to calculate shared library dependency +information. + +=cut + +init(); + +# Add directory to library search path. +if ($dh{L_PARAMS}) { + my @paths=(); + # Add to existing paths, if set. + push @paths, $ENV{'LD_LIBRARY_PATH'} + if exists $ENV{'LD_LIBRARY_PATH'}; + foreach (split(/:/, $dh{L_PARAMS})) { + # Force the path absolute. + if (m:^/:) { + push @paths, $_; + } + else { + push @paths, getcwd()."/$_"; + } + } + $dh{L_PARAMS}=join(':', @paths); + $ENV{'LD_LIBRARY_PATH'}=$dh{L_PARAMS}; + verbose_print("LD_LIBRARY_PATH=$dh{L_PARAMS}"); +} + +my $have_u_param_shlibs = 0; + +foreach my $param (@{$dh{U_PARAMS}}) { + if ($param !~ /^-/) { + $have_u_param_shlibs = 1; + } +} + +foreach my $package (@{$dh{DOPACKAGES}}) { + my $tmp=tmpdir($package); + my $ext=pkgext($package); + + my @filelist; + my $ff; + + # Generate a list of ELF binaries in the package, ignoring any + # we were told to exclude. + my $find_options=''; + if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') { + $find_options="! \\( $dh{EXCLUDE_FIND} \\)"; + } + foreach my $file (split(/\n/,`find $tmp -type f \\( -perm +111 -or -name "*.so*" \\) $find_options`)) { + # TODO this is slow, optimize. Ie, file can run once on + # multiple files.. + $ff=`file "$file"`; + if ($ff=~m/ELF/ && $ff!~/statically linked/) { + push @filelist,$file; + } + } + + if (@filelist or $have_u_param_shlibs) { + my @opts; + if (defined $dh{LIBPACKAGE} && length $dh{LIBPACKAGE}) { + @opts=("-L".tmpdir($dh{LIBPACKAGE}."/DEBIAN/shlibs")); + } + doit("dpkg-shlibdeps","-Tdebian/${ext}substvars", + @opts,@{$dh{U_PARAMS}},@filelist); + } +} + +=head1 SEE ALSO + +L + +This program is a part of debhelper. + +=head1 AUTHOR + +Joey Hess + +=cut --- zinf-2.2.5.orig/debian/itla-debuild.mk +++ zinf-2.2.5/debian/itla-debuild.mk @@ -0,0 +1,26 @@ +post-patches:: apply-patches +clean:: reverse-patches + +itla_patchfile = debian/++itla-debuild-patch.sh + +pre-build:: + chmod a+x $(itla_patchfile) + +apply-patches: pre-build debian/stamp-patched + +reverse-patches: pre-build $(itla_patchfile) + @set -e ; \ + if [ ! -e debian/stamp-patched ]; then \ + echo "Not reversing non-applied patch."; \ + exit 0; \ + fi; \ + $(itla_patchfile) -unpatch; \ + rm -f debian/stamp-patched + + +debian/stamp-patched: $(itla_patchfile) + @set -e ; \ + $(itla_patchfile) -patch; \ + touch debian/stamp-patched; + + --- zinf-2.2.5.orig/debian/rules +++ zinf-2.2.5/debian/rules @@ -0,0 +1,46 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/buildcore.mk +include debian/autotools-files.mk +include /usr/share/cdbs/1/class/autotools.mk +include debian/debhelper.mk +include debian/itla-debuild.mk + +DEB_DH_INSTALL_SOURCEDIR = debian/tmp + +DEB_CONFIGURE_EXTRA_ARGS = --enable-cmdline +ifeq ($(DEB_BUILD_ARCH),amd64) +DEB_CONFIGURE_EXTRA_FLAGS += CXXFLAGS="-Wall -g -O0" +endif + +DEB_AUTO_UPDATE_LIBTOOL = pre +DEB_AUTO_UPDATE_AUTOCONF = 2.50 +DEB_AUTO_UPDATE_AUTOMAKE = 1.8 + +export PATH := debian:$(PATH) + +# +# Packages that *used* to symlink their docs to a package they depend on +# +#DEB_NO_DOC_DIR_PKGS = zinf-extras zinf-plugin-alsa zinf-plugin-arts \ +# zinf-plugin-esound + + +DEB_DH_SHLIBDEPS_ARGS = -- $(wildcard debian/$(cdbs_curpkg)/usr/lib/zinf/plugins/*) + +pre-build:: + chmod a+x debian/dh_shlibdeps + + +common-install-arch:: + install -m 644 -D debian/zinf.xpm debian/tmp/usr/share/pixmaps/zinf.xpm + install -m 644 -D debian/zinf.desktop debian/tmp/usr/share/gnome/apps/Multimedia/zinf.desktop + +binary-post-install/zinf:: + dh_installmime -p$(cdbs_curpkg) + +$(patsubst %,binary-fixup/%,$(DEB_PACKAGES)):: + -chmod 644 debian/$(cdbs_curpkg)/usr/lib/zinf/plugins/* + +clean:: + rm -rf plugins --- zinf-2.2.5.orig/debian/shlibs.local +++ zinf-2.2.5/debian/shlibs.local @@ -0,0 +1 @@ +libttf 2 libttf2 (>= 1.4pre.20030402-1) --- zinf-2.2.5.orig/debian/zinf-extras.install +++ zinf-2.2.5/debian/zinf-extras.install @@ -0,0 +1,5 @@ +usr/lib/zinf/plugins/irman.ui +usr/lib/zinf/plugins/mpg123.ui +usr/lib/zinf/plugins/cmdline.ui +usr/lib/zinf/plugins/ncurses.ui + --- zinf-2.2.5.orig/debian/zinf-extras.links-deactivated +++ zinf-2.2.5/debian/zinf-extras.links-deactivated @@ -0,0 +1 @@ +/usr/share/doc/zinf /usr/share/doc/zinf-extras --- zinf-2.2.5.orig/debian/zinf-plugin-alsa.install +++ zinf-2.2.5/debian/zinf-plugin-alsa.install @@ -0,0 +1 @@ +usr/lib/zinf/plugins/alsa.pmo --- zinf-2.2.5.orig/debian/zinf-plugin-alsa.links-deactivated +++ zinf-2.2.5/debian/zinf-plugin-alsa.links-deactivated @@ -0,0 +1 @@ +/usr/share/doc/zinf /usr/share/doc/zinf-plugin-alsa --- zinf-2.2.5.orig/debian/zinf-plugin-arts.install +++ zinf-2.2.5/debian/zinf-plugin-arts.install @@ -0,0 +1 @@ +usr/lib/zinf/plugins/arts.pmo --- zinf-2.2.5.orig/debian/zinf-plugin-arts.links-deactivated +++ zinf-2.2.5/debian/zinf-plugin-arts.links-deactivated @@ -0,0 +1 @@ +/usr/share/doc/zinf /usr/share/doc/zinf-plugin-arts --- zinf-2.2.5.orig/debian/zinf-plugin-esound.install +++ zinf-2.2.5/debian/zinf-plugin-esound.install @@ -0,0 +1 @@ +usr/lib/zinf/plugins/esound.pmo --- zinf-2.2.5.orig/debian/zinf-plugin-esound.links-deactivated +++ zinf-2.2.5/debian/zinf-plugin-esound.links-deactivated @@ -0,0 +1 @@ +/usr/share/doc/zinf /usr/share/doc/zinf-plugin-esound --- zinf-2.2.5.orig/debian/zinf.1 +++ zinf-2.2.5/debian/zinf.1 @@ -0,0 +1,44 @@ +.\"Generated by db2man.xsl. Don't modify this, modify the source. +.de Sh \" Subsection +.br +.if t .Sp +.ne 5 +.PP +\fB\\$1\fR +.PP +.. +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp +.. +.de Ip \" List item +.br +.ie \\n(.$>=3 .ne \\$3 +.el .ne 3 +.IP "\\$1" \\$2 +.. +.TH "ZINF AUDIO PLAYER" 1 "" "" "" +.SH NAME +zinf \- Play audio files +.SH "SYNOPSIS" + +.nf +\fBzinf\fR [-save] [-ui \fIUI plugin name\fR] {\fIaudio file/stream\fR...} +.fi + +.SH "DESCRIPTION" + +.PP +ZINF is an extensible, cross-platform audio player. It features an optimized version of the GPLed Xing MPEG decoder which makes it one of the fastest and best sounding players available. ZINF provides a number of the most common features users have come to expect in a clean, easy to use interface. + +.SH "SEE ALSO" + +.PP + The ZINF homepage: \fIhttp://www.zinf.org\fR + +.SH "AUTHOR" + +.PP +This manual page was originally written by Andreas Rottmann , for the Debian GNU/Linux system (but may be used by others). + +.\" arch-tag: 597d533b-1744-421c-a01f-c54c04affb20 --- zinf-2.2.5.orig/debian/zinf.desktop +++ zinf-2.2.5/debian/zinf.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=ZINF +Comment=ZINF Audio Player +Exec=zinf +Icon=/usr/share/pixmaps/zinf.xpm +Terminal=false +MultipleArgs=false +Type=Application +MimeType=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg --- zinf-2.2.5.orig/debian/zinf.dirs +++ zinf-2.2.5/debian/zinf.dirs @@ -0,0 +1,8 @@ +usr/lib/zinf +usr/lib/zinf/plugins +usr/share/zinf +usr/share/zinf/themes +usr/share/pixmaps +usr/share/gnome/apps +usr/share/gnome/apps/Multimedia + --- zinf-2.2.5.orig/debian/zinf.docs +++ zinf-2.2.5/debian/zinf.docs @@ -0,0 +1,8 @@ +NEWS +README +doc/README.corbaui +doc/README.lcdui +doc/README.linux +doc/WISHLIST +doc/ThemeHowTo.txt +doc/user.txt --- zinf-2.2.5.orig/debian/zinf.install +++ zinf-2.2.5/debian/zinf.install @@ -0,0 +1,27 @@ +usr/bin/zinf +usr/share/pixmaps/zinf.xpm +usr/share/gnome/apps/Multimedia/zinf.desktop +usr/lib/zinf/plugins/local.pmi +usr/lib/zinf/plugins/http.pmi +usr/lib/zinf/plugins/obs.pmi +usr/lib/zinf/plugins/xingmp3.lmc +usr/lib/zinf/plugins/cd.lmc +usr/lib/zinf/plugins/vorbis.lmc +usr/lib/zinf/plugins/wav.lmc +usr/lib/zinf/plugins/cd.pmo +usr/lib/zinf/plugins/wavout.pmo +usr/lib/zinf/plugins/soundcard.pmo +usr/lib/zinf/plugins/vorbis.mdf +usr/lib/zinf/plugins/id3lib.mdf +usr/lib/zinf/plugins/mbcd.mdf +usr/lib/zinf/plugins/misc.mdf +usr/lib/zinf/plugins/winamp.ftf +usr/lib/zinf/plugins/kjofol.ftf +usr/lib/zinf/plugins/pls.plf +usr/lib/zinf/plugins/m3u.plf +usr/lib/zinf/plugins/zinf.ui +usr/lib/zinf/plugins/download.ui +usr/lib/zinf/plugins/musicbrowser.ui +usr/share/zinf/themes/Zinf.fat +usr/share/zinf/themes/ZinfClassic.fat +usr/share/zinf/themes/Aquatica.fat --- zinf-2.2.5.orig/debian/zinf.manpages +++ zinf-2.2.5/debian/zinf.manpages @@ -0,0 +1 @@ +debian/zinf.1 --- zinf-2.2.5.orig/debian/zinf.menu +++ zinf-2.2.5/debian/zinf.menu @@ -0,0 +1,3 @@ +?package(zinf): needs="X11" section="Apps/Sound" title="ZINF" \ + longtitle="ZINF Music Player" command="zinf" hints="Player" \ + icon="/usr/share/pixmaps/zinf.xpm" --- zinf-2.2.5.orig/debian/zinf.mime +++ zinf-2.2.5/debian/zinf.mime @@ -0,0 +1,6 @@ +audio/mpeg; zinf %s; test=test -n "$DISPLAY" +audio/mpegurl; zinf %s; test=test -n "$DISPLAY" +audio/x-wav; zinf %s; test=test -n "$DISPLAY" +audio/x-ogg; zinf %s; test=test -n "$DISPLAY" +audio/mp3; zinf %s; test=test -n "$DISPLAY" +audio/x-mp3; zinf %s; test=test -n "$DISPLAY" --- zinf-2.2.5.orig/debian/zinf.xml +++ zinf-2.2.5/debian/zinf.xml @@ -0,0 +1,60 @@ + + + + + + ZINF Audio Player + 1 + + + + zinf + Play audio files + + + + + + 2003Andreas Rottmann + + + + + zinf + -save + -ui UI plugin name + + audio file/stream + + + + + Description + + ZINF is an extensible, cross-platform audio player. It features an + optimized version of the GPLed Xing MPEG decoder which makes it one + of the fastest and best sounding players available. ZINF provides a + number of the most common features users have come to expect in a + clean, easy to use interface. + + + + See also + + The ZINF homepage + + + + Author + + This manual page was originally written by Andreas Rottmann + rotty@debian.org, for the Debian GNU/Linux + system (but may be used by others). + + + + + + --- zinf-2.2.5.orig/debian/zinf.xpm +++ zinf-2.2.5/debian/zinf.xpm @@ -0,0 +1,46 @@ +/* XPM */ +static char *zinf[] = { +/* columns rows colors chars-per-pixel */ +"32 32 8 1", +" c black", +". c #4A494A", +"X c #848684", +"o c #A5A6A5", +"O c #C6C7C6", +"+ c #FFFFF7", +"@ c gray100", +"# c None", +/* pixels */ +"################################", +"################################", +"################################", +"################################", +"################################", +"################################", +"################################", +"# #", +" OOOOOOOOOOOOOOOOOOOOOOOOOOOOOo ", +" OoooooooooooooooooooooooooooOo ", +" Oo++++++++++++++++++++++++++Oo ", +" Oo++++++++++++++++++++++++++Oo ", +" Oo++++++++++++++++++++++++++Oo ", +" Oo++++++++++++++++++++++++++Oo ", +" Oo++++++++++++++++++++++++++Oo ", +" Oo++++++++++++++++++++++++++Oo ", +" OOOOOOOOOOOOOOOOOOOOOOOOOOOOOo ", +" OO.OoXoXoXoOOOOO.OXoXoXoXoXoOo ", +" OOOOOOOOOOOOOOOOOOOOOOOOOOOOOo ", +" XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ", +" OOOOOOOOOOOOOOOOOOOOOOOOOOOOOo ", +" OOXXXXXXXXOOOXXXOXXXOXXXOXXXOo ", +" OOXXXXXXXXOOOXXXOXXXOXXXOXXXOo ", +" OOOOOOOOOOOOOOOOOOOOOOOOOOOOOo ", +" oooooooooooooooooooooooooooooo ", +"# #", +"################################", +"################################", +"################################", +"################################", +"################################", +"################################" +}; --- zinf-2.2.5.orig/debian/++itla-debuild-patch.sh +++ zinf-2.2.5/debian/++itla-debuild-patch.sh @@ -0,0 +1,91 @@ +#!/bin/sh -e +# +# patch script, automatically generated by itla-buildpackage +# + +echo itla-debuild patch-script: $# $1 + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +# Non-diff changes follow + + + +exit 0 + +# Now the diff part +--- orig/ui/zinf/Makefile.am ++++ mod/ui/zinf/Makefile.am +@@ -31,6 +31,22 @@ + src/Equalizer.cpp src/PixSliderControl.cpp \ + $(top_srcdir)/ui/musicbrowser/unix/src/gtkmessagedialog.cpp + ++Theme.o: ++@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -O0 -MT Theme.o -MD -MP -MF "$(DEPDIR)/Theme.Tpo" -c -o Theme.o `test -f 'src/Theme.cpp' || echo '$(srcdir)/'`src/Theme.cpp; \ ++@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/Theme.Tpo" "$(DEPDIR)/Theme.Po"; else rm -f "$(DEPDIR)/Theme.Tpo"; exit 1; fi ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/Theme.cpp' object='Theme.o' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/Theme.Po' tmpdepfile='$(DEPDIR)/Theme.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -O0 -c -o Theme.o `test -f 'src/Theme.cpp' || echo '$(srcdir)/'`src/Theme.cpp ++ ++Theme.lo: ++@am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -O0 -MT Theme.lo -MD -MP -MF "$(DEPDIR)/Theme.Tpo" -c -o Theme.lo `test -f 'src/Theme.cpp' || echo '$(srcdir)/'`src/Theme.cpp; \ ++@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/Theme.Tpo" "$(DEPDIR)/Theme.Plo"; else rm -f "$(DEPDIR)/Theme.Tpo"; exit 1; fi ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/Theme.cpp' object='Theme.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/Theme.Plo' tmpdepfile='$(DEPDIR)/Theme.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -O0 -c -o Theme.lo `test -f 'src/Theme.cpp' || echo '$(srcdir)/'`src/Theme.cpp ++ + zinf_ui_la_LDFLAGS = $(plugin_ldflags) + + noinst_HEADERS = $(inc_headers) $(unix_headers:%=unix/include/%) +--- orig/plm/playlist/pls/Makefile.am ++++ mod/plm/playlist/pls/Makefile.am +@@ -3,6 +3,7 @@ + plugin_LTLIBRARIES = pls-plf.la + + pls_plf_la_SOURCES = pls.cpp pls.h ++pls_plf_la_LIBADD = $(top_builddir)/lib/http/libhttp.la + pls_plf_la_LDFLAGS = $(plugin_ldflags) + + AM_CPPFLAGS = $(THREAD_CFLAGS) $(base_includes) \ +--- orig/plm/playlist/m3u/Makefile.am ++++ mod/plm/playlist/m3u/Makefile.am +@@ -3,7 +3,7 @@ + plugin_LTLIBRARIES = m3u-plf.la + + m3u_plf_la_SOURCES = m3u.cpp m3u.h +-#m3u_plf_la_LIBADD = $(ID3LIB_LIBS) ++m3u_plf_la_LIBADD = $(top_builddir)/lib/http/libhttp.la + m3u_plf_la_LDFLAGS = $(plugin_ldflags) + + AM_CPPFLAGS = $(THREAD_CFLAGS) $(base_includes) \ +--- orig/io/obs/obsinput.cpp ++++ mod/io/obs/obsinput.cpp +@@ -176,13 +176,10 @@ + int iReuse=0; + char szAddr[100], szSourceAddr[100]; + bool bUseTitleStreaming = false, bUseAltNIC = false;; +- char *path2 = new char[PATH_MAX]; + + ReportStatus(_("Setting up RTP stream...")); + +- iRet = sscanf(path2, "rtp://%[^:]:%d", szAddr, &iPort); +- m_path = path2; +- delete [] path2; ++ iRet = sscanf(m_path.c_str(), "rtp://%[^:]:%d", szAddr, &iPort); + if (iRet < 2) + { + ReportError(_("Invalid URL. URL format: rtp://[:port]")); --- zinf-2.2.5.orig/debian/compat +++ zinf-2.2.5/debian/compat @@ -0,0 +1 @@ +4