summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Mitchell <kevmitch@math.sfu.ca>2014-02-12 23:40:55 -0800
committerKevin Mitchell <kevmitch@math.sfu.ca>2014-02-12 23:43:21 -0800
commitb89e94df102c35c0e694b1f510b3662f09a02051 (patch)
treee808f6b1308d1b6511f01316c5a972bd9358c889
parent3b9375b7f5ce2267bdd8ab9edfba533767c40d6b (diff)
downloadmpv-build-b89e94df102c35c0e694b1f510b3662f09a02051.tar.bz2
mpv-build-b89e94df102c35c0e694b1f510b3662f09a02051.tar.xz
Explicitly allow libjack-jackd2-dev to be used instead of libjack-dev
This fixes a conflict encountered when installing skype on both debian and ubuntu. I don't know why this is necessary since libjack-jackd2-dev "provides" libjack-dev, but this seems to resolve the issue
-rw-r--r--debian/control2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/control b/debian/control
index 9bddfe2..bcf2c21 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends:
libfribidi-dev,
libgl1-mesa-dev,
libguess-dev,
- libjack-dev,
+ libjack-jackd2-dev | libjack-dev,
libjpeg-dev,
liblcms2-dev,
liblircclient-dev,