aboutsummaryrefslogtreecommitdiff
path: root/packages/linux_make
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2009-10-20 01:39:25 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2009-10-20 01:39:25 +0000
commitf862f9b9b0f1a4db241bb94ae03d0b59a63ff396 (patch)
treec983a752963e0d0f4cf64cd0c8b899ac6efaebfc /packages/linux_make
parente5e8436da5fe0803002e206617d29f25e51d0ea5 (diff)
switched Conflicts: from pd to puredata to allow other pd packages to co-exist with pd-extended
svn path=/trunk/; revision=12626
Diffstat (limited to 'packages/linux_make')
-rw-r--r--packages/linux_make/debian/control2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/linux_make/debian/control b/packages/linux_make/debian/control
index baa7ab53..554d2d29 100644
--- a/packages/linux_make/debian/control
+++ b/packages/linux_make/debian/control
@@ -8,7 +8,7 @@ Package: pd-extended
Architecture: i386
Depends: xterm | x-terminal-emulator, ttf-bitstream-vera, x-ttcidfont-conf, tcllib
Replaces: puredata, pd-externals, gem, pd-pdp, pd-zexy
-Conflicts: pd, pd-externals, gem, pd-pdp, pd-zexy
+Conflicts: puredata, pd-externals, gem, pd-pdp, pd-zexy
Provides: pd
Recommends: xdg-utils
Description: Pure Data with patches and a large collection of externals