From e6d4241a1434ab1f8a059145124e7c4de8248b3c Mon Sep 17 00:00:00 2001 From: Ivica Ico Bukvic <ico@vt.edu> Date: Wed, 3 Sep 2014 11:20:56 -0400 Subject: [PATCH] *simplified conflicts and dependencies --- packages/linux_make/Makefile | 10 +++++----- packages/linux_make/debian/control.desktop | 2 +- packages/linux_make/debian/control.raspbian | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/linux_make/Makefile b/packages/linux_make/Makefile index c7573384c..8515c4e2b 100644 --- a/packages/linux_make/Makefile +++ b/packages/linux_make/Makefile @@ -143,11 +143,11 @@ deb: $(bindir) # Pd-related scripts #install -p $(scripts_src)/pd-diff $(DESTDIR)$(bindir) install -p $(scripts_src)/config-switcher.sh $(DESTDIR)$(bindir) -# delete these since they are provided by the 'puredata' package - #rm -f $(DESTDIR)$(bindir)/pdsend - #rm -f $(DESTDIR)$(bindir)/pdreceive - #rm -f $(DESTDIR)/usr/share/man/man1/pdsend.1.gz - #rm -f $(DESTDIR)/usr/share/man/man1/pdreceive.1.gz +# delete these since they are provided by the 'puredata-utils' package + rm -f $(DESTDIR)$(bindir)/pdsend + rm -f $(DESTDIR)$(bindir)/pdreceive + rm -f $(DESTDIR)/usr/share/man/man1/pdsend.1.gz + rm -f $(DESTDIR)/usr/share/man/man1/pdreceive.1.gz # debian packaging test -d $(DESTDIR)/DEBIAN || mkdir -p $(DESTDIR)/DEBIAN cp $(packages_src)/linux_make/debian/control $(DESTDIR)/DEBIAN diff --git a/packages/linux_make/debian/control.desktop b/packages/linux_make/debian/control.desktop index c6878e51c..101b10431 100644 --- a/packages/linux_make/debian/control.desktop +++ b/packages/linux_make/debian/control.desktop @@ -10,7 +10,7 @@ Depends: xterm | x-terminal-emulator, ttf-dejavu-core, tcl, tk, libasound2, libj 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, libslv2-dev, dssi-utils, vco-plugins, wah-plugins, fil-plugins, mda-lv2 -Conflicts: puredata-utils, cyclist +Conflicts: cyclist Replaces: pd-l2ork Description: Interactive multimedia programming environment . diff --git a/packages/linux_make/debian/control.raspbian b/packages/linux_make/debian/control.raspbian index 454a450d2..629afcd7f 100644 --- a/packages/linux_make/debian/control.raspbian +++ b/packages/linux_make/debian/control.raspbian @@ -10,7 +10,7 @@ Depends: xterm | x-terminal-emulator, ttf-dejavu-core, tcl, tk, libasound2, libj 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, libslv2-dev, dssi-utils, vco-plugins, wah-plugins, fil-plugins, mda-lv2 -Conflicts: puredata-utils, cyclist +Conflicts: cyclist Replaces: pd-l2ork Description: Interactive multimedia programming environment . -- GitLab