aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorXavi Garcia Mena <xavi.garcia.mena@canonical.com>2015-10-21 15:16:58 +0200
committerXavi Garcia Mena <xavi.garcia.mena@canonical.com>2015-10-21 15:16:58 +0200
commit4dbdcf30a0ed10019d3350293c4ac52040393640 (patch)
treefa01e697dee299506a91d1d9f41c2a61f429fcc9 /debian
parent6ee23e401d3847e609f1ef50e1736f69e6253608 (diff)
parent86c449a7125f3ff90dcac353c8a4ad5a8c2cc46e (diff)
downloadayatana-indicator-sound-4dbdcf30a0ed10019d3350293c4ac52040393640.tar.gz
ayatana-indicator-sound-4dbdcf30a0ed10019d3350293c4ac52040393640.tar.bz2
ayatana-indicator-sound-4dbdcf30a0ed10019d3350293c4ac52040393640.zip
Fixed conflict. Updated changelog to be in sync with trunk
Diffstat (limited to 'debian')
-rw-r--r--debian/control11
1 files changed, 11 insertions, 0 deletions
diff --git a/debian/control b/debian/control
index 3585713..f170fcf 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,13 @@ Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
XSBC-Original-Maintainer: Conor Curran <conor.curran@canonical.com>
Build-Depends: debhelper (>= 9.0),
cmake,
+ cmake-extras (>= 0.4),
dbus,
dbus-test-runner (>> 14.04.0+14.04.20150120.1),
dh-translations,
gir1.2-accountsservice-1.0,
gnome-common,
+ google-mock (>= 1.6.0+svn437),
gsettings-ubuntu-schemas,
autotools-dev,
valac (>= 0.20),
@@ -18,13 +20,22 @@ Build-Depends: debhelper (>= 9.0),
libgirepository1.0-dev,
libglib2.0-dev (>= 2.22.3),
libgtest-dev,
+ libqtdbusmock1-dev (>= 0.3),
+ libqtdbustest1-dev,
+ libunity-api-dev,
liburl-dispatcher1-dev,
libpulse-dev (>= 1:4.0-0ubuntu21),
libpulse-mainloop-glib0 (>= 0.9.18),
libnotify-dev,
libgee-dev,
libxml2-dev,
+ pulseaudio,
python3-dbusmock,
+ qt5-default,
+ qtbase5-dev,
+ qtbase5-dev-tools,
+ qtdeclarative5-dev,
+ qtdeclarative5-dev-tools,
Standards-Version: 3.9.4
Homepage: https://launchpad.net/indicator-sound
# If you aren't a member of ~indicator-applet-developers but need to upload