update dependencies

2 files changed, 18 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 571bcb20c7ea..0f4a48cc13ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -71,23 +71,26 @@ pkgbase = pantheon-stable
 	depends = ttf-liberation
 	depends = ttf-opensans
 	depends = wingpanel
-	depends = wingpanel-indicator-a11y-stable
 	depends = wingpanel-indicator-bluetooth
 	depends = wingpanel-indicator-datetime
 	depends = wingpanel-indicator-keyboard
 	depends = wingpanel-indicator-network
 	depends = wingpanel-indicator-notifications
 	depends = wingpanel-indicator-power
+	depends = wingpanel-indicator-privacy-stable
 	depends = wingpanel-indicator-session
 	depends = wingpanel-indicator-sound
-	depends = xorg-server
-	depends = xorg-xinit
 	optdepends = urutau-icons
+	optdepends = wingpanel-indicator-a11y-stable
 	optdepends = wingpanel-indicator-nightlight
-	optdepends = wingpanel-indicator-privacy
 	provides = pantheon-stable
 	conflicts = pantheon-unstable
+	conflicts = granite-git
+	conflicts = wingpanel-git
+	conflicts = switchboard-git
 	conflicts = wingpanel-indicator-a11y-git
+	conflicts = wingpanel-indicator-nightlight-git
+	conflicts = wingpanel-indicator-privacy-git
 
 pkgname = pantheon-stable
 
diff --git a/PKGBUILD b/PKGBUILD
index 2cba5f4924e4..d0db37dd822b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -71,23 +71,28 @@ depends=(
 	'ttf-liberation'
 	'ttf-opensans'
 	'wingpanel'
-	'wingpanel-indicator-a11y-stable'
 	'wingpanel-indicator-bluetooth'
 	'wingpanel-indicator-datetime'
 	'wingpanel-indicator-keyboard'
 	'wingpanel-indicator-network'	
 	'wingpanel-indicator-notifications'
 	'wingpanel-indicator-power'
+	'wingpanel-indicator-privacy-stable'
 	'wingpanel-indicator-session'
 	'wingpanel-indicator-sound'
-	'xorg-server'
-	'xorg-xinit'
 	)
-optdepends=('urutau-icons' 'wingpanel-indicator-nightlight' 'wingpanel-indicator-privacy')
+optdepends=('urutau-icons' 'wingpanel-indicator-a11y-stable' 'wingpanel-indicator-nightlight')
 makedepends=('git' 'meson' 'ninja' 'vala>=0.40.3-1')
 provides=("${pkgname}")
-conflicts=('pantheon-unstable' 'wingpanel-indicator-a11y-git')
-
+conflicts=(
+	'pantheon-unstable'
+	'granite-git'
+	'wingpanel-git'
+	'switchboard-git'
+	'wingpanel-indicator-a11y-git'
+	'wingpanel-indicator-nightlight-git'
+	'wingpanel-indicator-privacy-git'
+	)
 package(){
   /bin/true
 }