*simplified conflicts and dependencies

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

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
  .

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
  .