From f6f996f458d8dfe5f1f930e8e07410541f2a6b2a Mon Sep 17 00:00:00 2001 From: Jonathan Wilkes Date: Thu, 7 Dec 2017 22:54:45 -0500 Subject: [PATCH] try using dpkg-shlibdeps for all linux-based runners --- packages/linux_make/Makefile | 14 +++++++------- packages/linux_make/debian/control | 2 +- packages/linux_make/debian/control.desktop | 2 +- packages/linux_make/debian/control.raspbian | 2 +- packages/linux_make/debian/control.ubuntu | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/linux_make/Makefile b/packages/linux_make/Makefile index f47e205d..5d889d47 100644 --- a/packages/linux_make/Makefile +++ b/packages/linux_make/Makefile @@ -12,11 +12,11 @@ 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. @@ -278,8 +278,8 @@ test_locations: @echo "MANUALSDIR $(manualsdir)" @echo "EXAMPLESDIR $(examplesdir)" @echo -------------------------------------------------- -# @echo "PACKAGE_DEPENDS $(PACKAGE_DEPENDS)" -# @echo -------------------------------------------------- + @echo "PACKAGE_DEPENDS $(PACKAGE_DEPENDS)" + @echo -------------------------------------------------- autoconf --version @echo -------------------------------------------------- make --version diff --git a/packages/linux_make/debian/control b/packages/linux_make/debian/control index eb6ca665..518fdbda 100644 --- a/packages/linux_make/debian/control +++ b/packages/linux_make/debian/control @@ -6,7 +6,7 @@ Maintainer: Ivica Ico Bukvic 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 eb6ca665..518fdbda 100644 --- a/packages/linux_make/debian/control.desktop +++ b/packages/linux_make/debian/control.desktop @@ -6,7 +6,7 @@ Maintainer: Ivica Ico Bukvic 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 b758c52d..518fdbda 100644 --- a/packages/linux_make/debian/control.raspbian +++ b/packages/linux_make/debian/control.raspbian @@ -6,7 +6,7 @@ Maintainer: Ivica Ico Bukvic 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 b203e170..363fbf04 100644 --- a/packages/linux_make/debian/control.ubuntu +++ b/packages/linux_make/debian/control.ubuntu @@ -6,7 +6,7 @@ Maintainer: Ivica Ico Bukvic 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 -- GitLab