--- djplay-0.5.0.orig/debian/rules +++ djplay-0.5.0/debian/rules @@ -0,0 +1,75 @@ +#!/usr/bin/make -f + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +config.status: configure + dh_testdir + +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + + QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 + + CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-mpeg3includes=/usr/include --with-qt-includes=/usr/include/qt3 --with-qt-librairies=/usr/lib + +build: build-stamp + +build-stamp: config.status + dh_testdir + $(MAKE) + touch build-stamp + +clean: + dh_testdir + dh_testroot + [ ! -f Makefile ] || $(MAKE) distclean + + dh_clean + rm -f m4/Makefile plugins/bitmapbutton/Makefile plugins/bitmapslider/Makefile + rm -f plugins/bitmapbutton/libbitmapbutton.so plugins/bitmapslider/libbitmapslider.so plugins/plugins_done + rm -f config.sub config.guess + + QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 + rm -rf .pc + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + $(MAKE) install DESTDIR=$(CURDIR)/debian/djplay + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_install + dh_installman debian/djplay.1 debian/djplay-launcher.1 + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- djplay-0.5.0.orig/debian/djplay-launcher +++ djplay-0.5.0/debian/djplay-launcher @@ -0,0 +1,41 @@ +#!/bin/sh +# DJPlay launch script +# Written by Adrien Cunin for Debian + +# First, get the jack driver the user wants to use (default: alsa). +# If jackd and qjackctl are not already running, launch them. +# Launch djplay. +# Kill jackd and qjackctl if they were not running before. + +jackdriver=alsa + +for argv in "$@"; do + param=${argv%=*} + value=${argv#*=} + case $param in + "--jackdriver") jackdriver="$value" ;; + "--help") echo "Options:\n --jackdriver=DRIVER: specify the driver used by jackd (default: alsa)"; exit 0 ;; + *) echo "Bad parameter, please use --help" >&2; exit 1 ;; + esac +done + +if [ -z "$(pidof jackd)" ]; then + jackd -d $jackdriver& + jpid="$(pidof jackd)" +fi + +if [ -z "$(pidof qjackctl.bin)" ]; then + qjackctl& + sleep 1s + qpid="$(pidof qjackctl.bin)" +fi + +djplay + +if [ -n "$jpid" ]; then + kill $jpid +fi + +if [ -n "$qpid" ]; then + kill $qpid +fi --- djplay-0.5.0.orig/debian/djplay.desktop +++ djplay-0.5.0/debian/djplay.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=DJPlay +Comment=High class live DJing application +Icon=/usr/share/djplay/djplay-icon.png +Exec=djplay-launcher +Categories=AudioVideo;Audio; +StartupNotify=true --- djplay-0.5.0.orig/debian/watch +++ djplay-0.5.0/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://sf.net/djplay/djplay-(.+)\.tar\.gz --- djplay-0.5.0.orig/debian/djplay.dirs +++ djplay-0.5.0/debian/djplay.dirs @@ -0,0 +1 @@ +usr/share/applications --- djplay-0.5.0.orig/debian/djplay-launcher.1 +++ djplay-0.5.0/debian/djplay-launcher.1 @@ -0,0 +1,32 @@ +.TH DJPLAY-LAUNCHER 1 "Aug 16, 2007" + +.SH NAME +djplay-launcher \- DJPlay launch script + +.SH SYNOPSIS +.B djplay-launcher + +.SH DESCRIPTION +This manual page documents briefly the +.B djplay-launcher +command. +.PP +\fBdjplay-launcher\fP is a shell script which runs jackd and qjackctl before launching DJPlay. + +It runs jackd and qjackctl if they are not already running, and then launches DJPlay. + +Once DJPlay is closed, it kills jackd and qjackctl if they were not running before. + +.SH OPTIONS +\fB\-\-jackdriver\fR=\fIDRIVER\fR +specify the driver used by jackd (default: alsa) + +.SH DOESN'T WORK +If jackd doesn't work correctly, try \fB\-\-jackdriver\fR=oss. + +.SH SEE ALSO +.BR djplay (1) + +.SH AUTHOR +\fBdjplay-launcher\fP and this manual page were written by Adrien Cunin , +for the Debian project (but may be used by others). --- djplay-0.5.0.orig/debian/README.Debian +++ djplay-0.5.0/debian/README.Debian @@ -0,0 +1,16 @@ +djplay for Debian +----------------- + +DJPlay needs jackd and qjackctl to be running. + +How to run DJPlay: + + * Use the djplay-launcher(1) script. + + * Manually: + + jackd -d alsa (replace alsa with oss if necessary) + qjackctl + djplay + + -- Adrien Cunin Thu, 16 Aug 2007 16:55:24 +0200 --- djplay-0.5.0.orig/debian/djplay.install +++ djplay-0.5.0/debian/djplay.install @@ -0,0 +1,2 @@ +debian/djplay-launcher /usr/bin/ +debian/djplay.desktop /usr/share/applications/ --- djplay-0.5.0.orig/debian/compat +++ djplay-0.5.0/debian/compat @@ -0,0 +1 @@ +7 --- djplay-0.5.0.orig/debian/control +++ djplay-0.5.0/debian/control @@ -0,0 +1,15 @@ +Source: djplay +Section: sound +Priority: optional +Maintainer: Adrien Cunin +Build-Depends: debhelper (>= 7), quilt, autotools-dev, libqt3-mt-dev, libjack-dev, libaudiofile-dev, libvorbis-dev, libsamplerate0-dev, libcdparanoia0-dev, libsoundtouch-dev, libid3-3.8.3-dev, libmad0-dev, libmpeg3-dev, ladspa-sdk, swh-plugins, tap-plugins, libxml2-dev, libusb-dev, libdjconsole-dev +Standards-Version: 3.7.3 +Homepage: http://djplay.sourceforge.net/ + +Package: djplay +Architecture: any +Depends: jackd, qjackctl, ${shlibs:Depends}, ${misc:Depends} +Description: A DJ application for Linux + DJPlay aims to be a high class live DJing application for Linux. DJPlay is a Qt + application and uses JACK Audio Connection Kit. It has many features and + supports icecast broadcasting. --- djplay-0.5.0.orig/debian/copyright +++ djplay-0.5.0/debian/copyright @@ -0,0 +1,56 @@ +This package was debianized by Adrien Cunin on +Sat, 9 Sep 2006 15:14:20 +0200. + +It was downloaded from http://djplay.sourceforge.net/ + +Upstream Authors: + Melanie Thielker + Olli Parviainen + Denis de Leeuw Duarte + Paul Davis (main author of JACK) + +Copyright: + Copyright (C) 2006 Melanie Thielker + Copyright (C) 2003 Olli Parviainen + Copyright (C) 2000 Paul Davis (main author of JACK) + +License (except BPMDetect.cpp, BPMDetect.h, FIFOSampleBuffer.cpp, FIFOSampleBuffer.h, FIFOSamplePipe.h, PeakFinder.cpp, PeakFinder.cpp): + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General Public License +can be found in `/usr/share/common-licenses/GPL-2'. + +License (BPMDetect.cpp, BPMDetect.h, FIFOSampleBuffer.cpp, FIFOSampleBuffer.h, FIFOSamplePipe.h, PeakFinder.cpp, PeakFinder.cpp): + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Lesser General Public License +can be found in `/usr/share/common-licenses/LGPL-2'. + +The Debian packaging is Copyright (C) 2006, Adrien Cunin and +is licensed under the GPL, see above. --- djplay-0.5.0.orig/debian/changelog +++ djplay-0.5.0/debian/changelog @@ -0,0 +1,117 @@ +djplay (0.5.0-3.2) unstable; urgency=low + + * Non-maintainer upload. + * Add missing #include statements to fix FTBFS on all architectures; + Closes: #629686 and LP: 595827 + * Fix build-dependency on JACK (Closes: #595846). + * Fix build-dependency on libsoundtouch-dev (Closes: #615512). + * Explicitly set source format to 1.0. + + -- Alessio Treglia Mon, 08 Aug 2011 12:37:32 +0200 + +djplay (0.5.0-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Add quilt patch system. + + Add README.source for quilt patch system. + * 01_noglib.diff - (Closes: #523640). + + Remove dependency and patch to build without glib1.2. + * 02_const_char.diff - Use const char *. Fix FTBFS. + * Replace libjack0.100.0-dev b-d with libjack-dev. (Closes: #527417). + * Copy in config.{sub,guess} on configure, rm them on clean. + * debian/djplay-launcher: + - Changed $(pidof qjackctl) to $(pidof qjackctl.bin). + - Add sleep 1s between launching qjackctl and getting qjackctl.bin's pid. + - Taken from Ubuntu package. + * debian/copyright: + + Version paths to common licenses. + + Add appropriate copyright holders. + + Minor syntax clean-up. + * Remove deprecated dh_desktop call. + * Replace dh_clean -k call with dh_prep. + + -- Barry deFreese Wed, 11 Nov 2009 09:30:19 -0500 + +djplay (0.5.0-3) unstable; urgency=low + + * debian/control: + - Removed useless libqt3-compat-headers build-dependency (Closes: #464253) + - Moved homepage to the new field + - Updated Standards-Version to 3.7.3 + * debian/rules: added dh_desktop call + * debian/{control,compat}: updated to debhelper 7 + + -- Adrien Cunin Thu, 22 May 2008 16:07:28 +0200 + +djplay (0.5.0-2) unstable; urgency=low + + * debian/{control,copyright,djplay.1}: updated my email address + * Added debian/watch + * debian/djplay-launcher{,.1}: added, new script which eases the process of + launching DJPlay + * debian/README.Debian: updated accordingly + * debian/djplay.desktop: added + * debian/djplay.{install,dirs}: install djplay-launcher and djplay.desktop + * debian/rules: fixed lintian warning, install djplay-launcher man page + + -- Adrien Cunin Thu, 16 Aug 2007 16:55:24 +0200 + +djplay (0.5.0-1) unstable; urgency=low + + * First upload to Debian + + -- Adrien Cunin Sat, 6 Jan 2007 17:07:14 +0100 + +djplay (0.5.0-0ubuntu1) feisty; urgency=low + + * New upstream release (Closes Malone: #75634) + * Build-Depends: added libdjconsole-dev + + -- Adrien Cunin Fri, 22 Dec 2006 22:36:10 +0100 + +djplay (0.4.1-0ubuntu1) feisty; urgency=low + + * New upstream release + * All patches dropped: integrated upstream or no longer needed + * Removed dpatch + - Removed build-dep on dpatch + - Removed debian/patches/ + - Removed dpatch stuff in debian/rules + * Added build-dep on libusb-dev + * debian/rules: + - Removed "export QTDIR=/usr/include/qt3" + - Added ./configure options: --with-qt-includes=/usr/include/qt3 --with-qt-librairies=/usr/lib + - Updated the clean rule + + -- Adrien Cunin Sat, 18 Nov 2006 22:01:34 +0100 + +djplay (0.3.0-0ubuntu3) feisty; urgency=low + + * debian/patches/06_fix_segfault_jackd.dpatch: patch from upstream + - fix segfault when jackd is not running (Closes Malone: #70783) + + -- Adrien Cunin Wed, 8 Nov 2006 16:22:08 +0100 + +djplay (0.3.0-0ubuntu2) edgy; urgency=low + + * debian/patches/05_64bits.dpatch: + - add support for 64 bits by replacing some "int" with "long" + * debian/control: + - set Architecture to any + - added a space before "Homepage:" in description + + -- Adrien Cunin Fri, 13 Oct 2006 17:52:37 +0200 + +djplay (0.3.0-0ubuntu1) edgy; urgency=low + + * Initial release + * debian/patches/01_qtdir.dpatch: + - fix libqt include directory + * debian/patches/02_bitmapbutton.dpatch: + - change bitmapbutton.h include location + * debian/patches/03_bitmapslider.dpatch: + - change bitmapslider.h include location + * debian/patches/04_mp3map.dpatch: + - remove "Mp3Map::" to make it compile with this version of gcc + + -- Adrien Cunin Sat, 9 Sep 2006 15:14:20 +0200 --- djplay-0.5.0.orig/debian/docs +++ djplay-0.5.0/debian/docs @@ -0,0 +1 @@ +AUTHORS --- djplay-0.5.0.orig/debian/README.source +++ djplay-0.5.0/debian/README.source @@ -0,0 +1,58 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + break + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command. --- djplay-0.5.0.orig/debian/djplay.1 +++ djplay-0.5.0/debian/djplay.1 @@ -0,0 +1,29 @@ +.TH DJPLAY 1 "Jan 6, 2007" + +.SH NAME +djplay \- a DJ application for Linux + +.SH SYNOPSIS +.B djplay + +.SH DESCRIPTION +This manual page documents briefly the +.B djplay +command. +.PP +\fBdjplay\fP aims to be a high class live DJing application for Linux. + +DJPlay is written with Qt and uses JACK Audio Connection Kit. Many features are available such as icecast broadcasting. +It supports all non-audio functions (LEDs, buttons, controllers) of the Hercules DJ Console MK I and MK II via libdjconsole. + +.SH OPTIONS +No command line options. + +.SH SEE ALSO +\fIhttp://djplay.sourceforge.net/\fR + +.SH AUTHOR +\fBdjplay\fP was written by Melanie Thielker. +.PP +This manual page was written by Adrien Cunin , +for the Debian project (but may be used by others). --- djplay-0.5.0.orig/debian/source/format +++ djplay-0.5.0/debian/source/format @@ -0,0 +1 @@ +1.0 --- djplay-0.5.0.orig/debian/patches/01_noglib.diff +++ djplay-0.5.0/debian/patches/01_noglib.diff @@ -0,0 +1,173 @@ +Index: djplay-0.5.0/configure +=================================================================== +--- djplay-0.5.0.orig/configure 2009-11-11 09:54:21.000000000 -0500 ++++ djplay-0.5.0/configure 2009-11-11 10:07:07.000000000 -0500 +@@ -470,7 +470,7 @@ + # include + #endif" + +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE CC CFLAGS ac_ct_CC CCDEPMODE LEX LEXLIB LEX_OUTPUT_ROOT LN_S YACC CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os ECHO RANLIB ac_ct_RANLIB CXXCPP EGREP LIBTOOL MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB PLUGIN_QTDIR QT_LDFLAGS ac_qmake ac_moc ac_uic PKG_CONFIG JACK_CFLAGS JACK_LIBS GLIB_CFLAGS GLIB_LIBS XML2_CFLAGS XML2_LIBS LIBUSB_CFLAGS LIBUSB_LIBS LIBDJCONSOLE_CFLAGS LIBDJCONSOLE_LIBS target target_cpu target_vendor target_os SDL_CONFIG SDL_CFLAGS SDL_LIBS OGG_PREFIX OGG_CFLAGS OGG_LDFLAGS OGG_LIBS VORBIS_PREFIX VORBIS_CFLAGS VORBIS_LDFLAGS VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS LIBOBJS dontbuild_moc LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE CC CFLAGS ac_ct_CC CCDEPMODE LEX LEXLIB LEX_OUTPUT_ROOT LN_S YACC CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os ECHO RANLIB ac_ct_RANLIB CXXCPP EGREP LIBTOOL MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB PLUGIN_QTDIR QT_LDFLAGS ac_qmake ac_moc ac_uic PKG_CONFIG JACK_CFLAGS JACK_LIBS XML2_CFLAGS XML2_LIBS LIBUSB_CFLAGS LIBUSB_LIBS LIBDJCONSOLE_CFLAGS LIBDJCONSOLE_LIBS target target_cpu target_vendor target_os SDL_CONFIG SDL_CFLAGS SDL_LIBS OGG_PREFIX OGG_CFLAGS OGG_LDFLAGS OGG_LIBS VORBIS_PREFIX VORBIS_CFLAGS VORBIS_LDFLAGS VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS LIBOBJS dontbuild_moc LTLIBOBJS' + ac_subst_files='' + + # Initialize some variables set by options. +@@ -11965,104 +11965,6 @@ + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then +- echo "$as_me:$LINENO: checking for glib >= 1.2.0" >&5 +-echo $ECHO_N "checking for glib >= 1.2.0... $ECHO_C" >&6 +- +- if $PKG_CONFIG --exists "glib >= 1.2.0" ; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +- succeeded=yes +- +- echo "$as_me:$LINENO: checking GLIB_CFLAGS" >&5 +-echo $ECHO_N "checking GLIB_CFLAGS... $ECHO_C" >&6 +- GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib >= 1.2.0"` +- echo "$as_me:$LINENO: result: $GLIB_CFLAGS" >&5 +-echo "${ECHO_T}$GLIB_CFLAGS" >&6 +- +- echo "$as_me:$LINENO: checking GLIB_LIBS" >&5 +-echo $ECHO_N "checking GLIB_LIBS... $ECHO_C" >&6 +- GLIB_LIBS=`$PKG_CONFIG --libs "glib >= 1.2.0"` +- echo "$as_me:$LINENO: result: $GLIB_LIBS" >&5 +-echo "${ECHO_T}$GLIB_LIBS" >&6 +- else +- GLIB_CFLAGS="" +- GLIB_LIBS="" +- ## If we have a custom action on failure, don't print errors, but +- ## do set a variable so people can do so. +- GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib >= 1.2.0"` +- echo $GLIB_PKG_ERRORS +- fi +- +- +- +- else +- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." +- echo "*** See http://www.freedesktop.org/software/pkgconfig" +- fi +- fi +- +- if test $succeeded = yes; then +- : +- else +- { { echo "$as_me:$LINENO: error: Library requirements (glib >= 1.2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +-echo "$as_me: error: Library requirements (glib >= 1.2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} +- { (exit 1); exit 1; }; } +- fi +- +- +- succeeded=no +- +- if test -z "$PKG_CONFIG"; then +- # Extract the first word of "pkg-config", so it can be a program name with args. +-set dummy pkg-config; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $PKG_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" +- ;; +-esac +-fi +-PKG_CONFIG=$ac_cv_path_PKG_CONFIG +- +-if test -n "$PKG_CONFIG"; then +- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +-echo "${ECHO_T}$PKG_CONFIG" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- fi +- +- if test "$PKG_CONFIG" = "no" ; then +- echo "*** The pkg-config script could not be found. Make sure it is" +- echo "*** in your path, or set the PKG_CONFIG environment variable" +- echo "*** to the full path to pkg-config." +- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." +- else +- PKG_CONFIG_MIN_VERSION=0.9.0 +- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo "$as_me:$LINENO: checking for libxml-2.0 >= 2-2.4.23" >&5 + echo $ECHO_N "checking for libxml-2.0 >= 2-2.4.23... $ECHO_C" >&6 + +@@ -17132,8 +17034,8 @@ + done + + +-LIBS="-lqt-mt $JACK_LIBS $GLIB_LIBS $LIBS" +-CXXFLAGS="-include djplay.h -DQT_THREAD_SUPPORT $JACK_CFLAGS $GLIB_CFLAGS $CXXFLAGS" ++LIBS="-lqt-mt $JACK_LIBS $LIBS" ++CXXFLAGS="-include djplay.h -DQT_THREAD_SUPPORT $JACK_CFLAGS $CXXFLAGS" + + CXXFLAGS="`echo $CXXFLAGS | sed -e \"s/-I\/usr\/include //\"`" + +@@ -17875,8 +17777,6 @@ + s,@PKG_CONFIG@,$PKG_CONFIG,;t t + s,@JACK_CFLAGS@,$JACK_CFLAGS,;t t + s,@JACK_LIBS@,$JACK_LIBS,;t t +-s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t +-s,@GLIB_LIBS@,$GLIB_LIBS,;t t + s,@XML2_CFLAGS@,$XML2_CFLAGS,;t t + s,@XML2_LIBS@,$XML2_LIBS,;t t + s,@LIBUSB_CFLAGS@,$LIBUSB_CFLAGS,;t t +Index: djplay-0.5.0/configure.ac +=================================================================== +--- djplay-0.5.0.orig/configure.ac 2009-11-11 09:54:21.000000000 -0500 ++++ djplay-0.5.0/configure.ac 2009-11-11 10:07:07.000000000 -0500 +@@ -104,7 +104,6 @@ + AC_CHECK_LIB(Xext, main) + + PKG_CHECK_MODULES(JACK, jack >= 0.80.0) +-PKG_CHECK_MODULES(GLIB, glib >= 1.2.0) + PKG_CHECK_MODULES(XML2, libxml-2.0 >= 2-2.4.23, + [AC_DEFINE([HAVE_LIBXML2],[1],[Define if you have the xml2 library])],[echo "XML editing disabled"] + ) +@@ -242,8 +241,8 @@ + AC_FUNC_STAT + AC_CHECK_FUNCS([getcwd memmove memset pow sqrt strcasecmp strchr strrchr strstr]) + +-LIBS="-lqt-mt $JACK_LIBS $GLIB_LIBS $LIBS" +-CXXFLAGS="-include djplay.h -DQT_THREAD_SUPPORT $JACK_CFLAGS $GLIB_CFLAGS $CXXFLAGS" ++LIBS="-lqt-mt $JACK_LIBS $LIBS" ++CXXFLAGS="-include djplay.h -DQT_THREAD_SUPPORT $JACK_CFLAGS $CXXFLAGS" + + CXXFLAGS="`echo $CXXFLAGS | sed -e \"s/-I\/usr\/include //\"`" + AC_SUBST(dontbuild_moc) +Index: djplay-0.5.0/jack.h +=================================================================== +--- djplay-0.5.0.orig/jack.h 2009-11-11 10:07:18.000000000 -0500 ++++ djplay-0.5.0/jack.h 2009-11-11 10:07:30.000000000 -0500 +@@ -3,7 +3,6 @@ + + #include + #include +-#include + #include + #include + #include "wavelet.h" --- djplay-0.5.0.orig/debian/patches/series +++ djplay-0.5.0/debian/patches/series @@ -0,0 +1,3 @@ +01_noglib.diff +02_const_char.diff +03_fstat.diff --- djplay-0.5.0.orig/debian/patches/03_fstat.diff +++ djplay-0.5.0/debian/patches/03_fstat.diff @@ -0,0 +1,21 @@ +Description: Fix no matching function for call to + stat::stat(const char*, stat*) error, fix FTBFS. +Origin: Ubuntu +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=629686 +Bug-Ubuntu: https://launchpad.net/bugs/595827 +Forwarded: no +--- + mp3map.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +--- djplay-0.5.0.orig/mp3map.cpp ++++ djplay-0.5.0/mp3map.cpp +@@ -8,6 +8,8 @@ + #include + #include + #include ++#include ++#include + + #define ALLOCATION_STEP 8192 + --- djplay-0.5.0.orig/debian/patches/02_const_char.diff +++ djplay-0.5.0/debian/patches/02_const_char.diff @@ -0,0 +1,26 @@ +Index: djplay-0.5.0/loader.cpp +=================================================================== +--- djplay-0.5.0.orig/loader.cpp 2009-11-11 10:07:55.000000000 -0500 ++++ djplay-0.5.0/loader.cpp 2009-11-11 10:08:18.000000000 -0500 +@@ -82,7 +82,7 @@ + + if(!new_source) + { +- char *ext=strrchr(File, '.'); ++ const char *ext=strrchr(File, '.'); + if(!ext) + ext=""; + +Index: djplay-0.5.0/mainwnd.ui.h +=================================================================== +--- djplay-0.5.0.orig/mainwnd.ui.h 2009-11-11 10:08:49.000000000 -0500 ++++ djplay-0.5.0/mainwnd.ui.h 2009-11-11 10:09:18.000000000 -0500 +@@ -975,7 +975,7 @@ + pframe=0; + warned=false; + current_file=e->file(); +- char *ext=strrchr(current_file, '.'); ++ const char *ext=strrchr(current_file, '.'); + if(!ext) + ext=""; + current_file_name=info.fileName().left(info.fileName().length()-strlen(ext));