diff --git a/packages/linux_make/Makefile b/packages/linux_make/Makefile index f47e205d30b1b3014e7b6e6dd2af85270596da0e..e19036680c8c3a3060326ae41d7b32be703571cc 100644 --- a/packages/linux_make/Makefile +++ b/packages/linux_make/Makefile @@ -12,18 +12,16 @@ BUILDLAYOUT_DIR = $(cvs_root_dir)/packages include $(BUILDLAYOUT_DIR)/Makefile.buildlayout # if machine has dpkg-deb, build a Debian package -#ifeq ($(shell test -x /usr/bin/dpkg-deb && echo YES),YES) -# PACKAGE_TYPE = deb -#else -# PACKAGE_TYPE = tarbz2 -#endif +ifeq ($(shell test -x /usr/bin/dpkg-deb && echo YES),YES) + PACKAGE_TYPE = deb +else + PACKAGE_TYPE = tarbz2 +endif # for command-line UNIX versions, you need to install Pd into the same # directory as $(prefix) otherwise Pd won't be able to find extra, doc, etc. ifeq ($(PACKAGE_TYPE),deb) prefix = /usr - # generates the dependencies for all externals and pd itself - PACKAGE_DEPENDS := $(shell find $(DESTDIR) \( -name "*.pd_linux" -or -name pd-gui -or -wholename \*bin/pd \) -print0 | xargs -0 dpkg-shlibdeps -O | sed 's|shlibs:Depends=|, |' ) else prefix = /usr/local endif @@ -160,6 +158,9 @@ deb: debstage cp $(packages_src)/linux_make/debian/control $(DESTDIR)/DEBIAN cp $(packages_src)/linux_make/debian/pd-l2ork.postrm $(DESTDIR)/DEBIAN cp $(packages_src)/linux_make/debian/pd-l2ork.postinst $(DESTDIR)/DEBIAN +# generate the dependencies for all externals and pd itself + $(eval PACKAGE_DEPENDS := $(shell find $(DESTDIR) \( -name "*.pd_linux" -or -name pd-gui -or -wholename \*bin/pd \) -print0 | xargs -0 dpkg-shlibdeps -O | sed 's|shlibs:Depends=|, |' )) + # set build architecture and version for the package sed -i 's|^Version:.*|Version: $(DEB_PD_VERSION)|' \ $(DESTDIR)/DEBIAN/control @@ -279,7 +280,7 @@ test_locations: @echo "EXAMPLESDIR $(examplesdir)" @echo -------------------------------------------------- # @echo "PACKAGE_DEPENDS $(PACKAGE_DEPENDS)" -# @echo -------------------------------------------------- + @echo -------------------------------------------------- autoconf --version @echo -------------------------------------------------- make --version diff --git a/packages/linux_make/debian/control b/packages/linux_make/debian/control index eb6ca665652a5e42f65aca033542f961171d1741..518fdbdaf5ad56f36484fe140f1a046c794c3250 100644 --- a/packages/linux_make/debian/control +++ b/packages/linux_make/debian/control @@ -6,7 +6,7 @@ Maintainer: Ivica Ico Bukvic <ico@vt.edu> Homepage: http://l2ork.music.vt.edu Package: pd-l2ork Architecture: i386 -Depends: libc6, xterm | x-terminal-emulator, libasound2, libjack-jackd2-0, libbluetooth3, libgl1-mesa-glx, libgl1-mesa-dri, libglu1-mesa, libftgl2, libgmerlin0, libgmerlin-avdec1, libavifile-0.7c2, libmpeg3-1 | libmpeg3-2, libquicktime2, libv4l-0, libraw1394-11, libdc1394-22, libfftw3-3, libvorbis0a, libmp3lame0, libspeex1, libgsl0ldbl | libgsl2, python, libsmpeg0, libjpeg62, libflite1, libgsm1, libxv1, fluid-soundfont-gm, byacc +Depends: python, fluid-soundfont-gm Provides: pd-l2ork Installed-Size: 90624 Recommends: xdg-utils, pulseaudio-utils, tap-plugins, ladspa-foo-plugins, invada-studio-plugins-ladspa, blepvco, swh-plugins, mcp-plugins, cmt, blop, slv2-jack, omins, ubuntustudio-audio-plugins, rev-plugins, dssi-utils, vco-plugins, wah-plugins, fil-plugins, mda-lv2 diff --git a/packages/linux_make/debian/control.desktop b/packages/linux_make/debian/control.desktop index eb6ca665652a5e42f65aca033542f961171d1741..518fdbdaf5ad56f36484fe140f1a046c794c3250 100644 --- a/packages/linux_make/debian/control.desktop +++ b/packages/linux_make/debian/control.desktop @@ -6,7 +6,7 @@ Maintainer: Ivica Ico Bukvic <ico@vt.edu> Homepage: http://l2ork.music.vt.edu Package: pd-l2ork Architecture: i386 -Depends: libc6, xterm | x-terminal-emulator, libasound2, libjack-jackd2-0, libbluetooth3, libgl1-mesa-glx, libgl1-mesa-dri, libglu1-mesa, libftgl2, libgmerlin0, libgmerlin-avdec1, libavifile-0.7c2, libmpeg3-1 | libmpeg3-2, libquicktime2, libv4l-0, libraw1394-11, libdc1394-22, libfftw3-3, libvorbis0a, libmp3lame0, libspeex1, libgsl0ldbl | libgsl2, python, libsmpeg0, libjpeg62, libflite1, libgsm1, libxv1, fluid-soundfont-gm, byacc +Depends: python, fluid-soundfont-gm Provides: pd-l2ork Installed-Size: 90624 Recommends: xdg-utils, pulseaudio-utils, tap-plugins, ladspa-foo-plugins, invada-studio-plugins-ladspa, blepvco, swh-plugins, mcp-plugins, cmt, blop, slv2-jack, omins, ubuntustudio-audio-plugins, rev-plugins, dssi-utils, vco-plugins, wah-plugins, fil-plugins, mda-lv2 diff --git a/packages/linux_make/debian/control.raspbian b/packages/linux_make/debian/control.raspbian index b758c52de69cc1750dec551450fc09dcc80c7894..518fdbdaf5ad56f36484fe140f1a046c794c3250 100644 --- a/packages/linux_make/debian/control.raspbian +++ b/packages/linux_make/debian/control.raspbian @@ -6,7 +6,7 @@ Maintainer: Ivica Ico Bukvic <ico@vt.edu> Homepage: http://l2ork.music.vt.edu Package: pd-l2ork Architecture: i386 -Depends: xterm | x-terminal-emulator, libasound2, libjack-jackd2-0, libbluetooth3, libgl1-mesa-glx, libglu1-mesa, libftgl2, libgmerlin0, libgmerlin-avdec1, libavifile-0.7c2, libmpeg3-1 | libmpeg3-2, libquicktime2, libv4l-0, libraw1394-11, libdc1394-22, libfftw3-3, libvorbis0a, libmp3lame0, libspeex1, libgsl0ldbl, python, libsmpeg0, libjpeg62, tkpng, libflite1, libgsm1, libxv1, fluid-soundfont-gm, byacc +Depends: python, fluid-soundfont-gm Provides: pd-l2ork Installed-Size: 90624 Recommends: xdg-utils, pulseaudio-utils, tap-plugins, ladspa-foo-plugins, invada-studio-plugins-ladspa, blepvco, swh-plugins, mcp-plugins, cmt, blop, slv2-jack, omins, ubuntustudio-audio-plugins, rev-plugins, dssi-utils, vco-plugins, wah-plugins, fil-plugins, mda-lv2 diff --git a/packages/linux_make/debian/control.ubuntu b/packages/linux_make/debian/control.ubuntu index b203e170b31b2e312758f97e98d742b577902201..363fbf047959e9076be33991e6dee51fd64fffd4 100644 --- a/packages/linux_make/debian/control.ubuntu +++ b/packages/linux_make/debian/control.ubuntu @@ -6,7 +6,7 @@ Maintainer: Ivica Ico Bukvic <ico@vt.edu> Homepage: http://l2ork.music.vt.edu Package: pd-l2ork Architecture: i386 -Depends: xterm | x-terminal-emulator, libc6 (>= 2.1.5), libasound2, libjack-jackd2-0, libbluetooth3, libgl1-mesa-glx, libgl1-mesa-dri, libglu1-mesa, libglew1.5, libmagick++4, libftgl2, libgmerlin0, libgmerlin-avdec1, libavifile-0.7c2, libmpeg3-1, libquicktime2, libv4l-0, libraw1394-11, libdc1394-22, libfftw3-3, libvorbis0a, libmp3lame0, libspeex1, libgsl0ldbl, python, libsmpeg0, libjpeg62, libflite1, libgsm1 +Depends: python, fluid-soundfont-gm Provides: pd-l2ork Installed-Size: 90624 Recommends: xdg-utils, pulseaudio-utils, tap-plugins, ladspa-foo-plugins, invada-studio-plugins-ladspa, blepvco, swh-plugins, mcp-plugins, cmt, blop, slv2-jack, omins, ubuntustudio-audio-plugins, rev-plugins, dssi-utils, vco-plugins, wah-plugins, fil-plugins, mda-lv2 diff --git a/pd/src/s_file.c b/pd/src/s_file.c index 8ffcffcaf090df721f794d0b0a26772a6e23e9a6..c12bb98b69cf8b650f151814ba0393f8f0c60db5 100644 --- a/pd/src/s_file.c +++ b/pd/src/s_file.c @@ -46,7 +46,7 @@ void sys_doflags( void); #ifdef UNIX -#define USER_CONFIG_DIR ".pd-l2ork" +#define USER_CONFIG_DIR ".purr-data" static char *sys_prefbuf;