Cleanup and revamp depends, provides, conflicts

2 files changed, 15 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9a6fad01060a..5109af323d66 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wingpanel-standalone-git
 	pkgdesc = Stylish top panel that holds indicators and spawns an application launcher (without Gala dependencies)
-	pkgver = r620.6437f0d
-	pkgrel = 2
+	pkgver = r635.8840516
+	pkgrel = 1
 	url = https://github.com/elementary/wingpanel
 	arch = i686
 	arch = x86_64
@@ -11,10 +11,12 @@ pkgbase = wingpanel-standalone-git
 	makedepends = libgranite.so
 	makedepends = git
 	makedepends = vala
+	depends = glib2
+	depends = gtk3
 	depends = libgee
 	depends = libgranite.so
 	depends = libwnck3
-	depends = cogl
+	depends = pantheon-notifications
 	optdepends = pantheon-applications-menu-git: Application launcher
 	optdepends = wingpanel-indicator-a11y-git: Tray applet
 	optdepends = wingpanel-indicator-bluetooth-git: Tray applet
@@ -26,23 +28,16 @@ pkgbase = wingpanel-standalone-git
 	optdepends = wingpanel-indicator-session-git: Tray applet
 	optdepends = wingpanel-indicator-sensors-git: Tray applet
 	optdepends = wingpanel-indicator-sound-git: Tray applet
-	optdepends = wingpanel-indicator-ayatana-git: Display Unity 7 tray applets
-	optdepends = wingpanel-indicator-namarupa-git: Display Unity 7 tray applets
-	optdepends = indicator-powersave: On the fly power savings and performance toggles
-	optdepends = glippy-indicator: Excellent clipboard manager applet
-	optdepends = ubuntu-indicator-weather: Simple weather applet
+	optdepends = wingpanel-indicator-ayatana-git: Display Unity 7 tray applets}
+	optdepends = wingpanel-indicator-namarupa-git: Display Unity 7 tray applets}
 	provides = wingpanel
-	provides = wingpanel-bzr
-	provides = wingpanel-standalone-bzr
 	provides = wingpanel-git
 	provides = libwingpanel.so
-	provides = libwingpanel-3.0.so
+	provides = libwingpanel-2.0.so
 	conflicts = wingpanel
-	conflicts = wingpanel-bzr
-	conflicts = wingpanel-standalone-bzr
 	conflicts = wingpanel-git
 	conflicts = libwingpanel.so
-	conflicts = libwingpanel-3.0.so
+	conflicts = libwingpanel-2.0.so
 	replaces = wingpanel-standalone-bzr
 	source = git+https://github.com/elementary/wingpanel.git
 	source = minus-backgroundmanager.patch
@@ -58,4 +53,3 @@ pkgbase = wingpanel-standalone-git
 	sha256sums = 5b29e24b4dc9076d54621334b839d2dbfa6a6adce1e8b444e38c2412f314f8c7
 
 pkgname = wingpanel-standalone-git
-
diff --git a/PKGBUILD b/PKGBUILD
index b7800c903e7c..d9d15a3ac2c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,24 +2,21 @@
 # Contributor: Maxime Gauduin <alucryd@archlinux.org>
 
 pkgname=wingpanel-standalone-git
-pkgver=r620.6437f0d
-pkgrel=2
+pkgver=r635.8840516
+pkgrel=1
 pkgdesc='Stylish top panel that holds indicators and spawns an application launcher (without Gala dependencies)'
 arch=('i686' 'x86_64')
 url='https://github.com/elementary/wingpanel'
 license=('GPL3')
 groups=('pantheon-qq')
-depends=(lib{gee,granite.so,wnck3} 'cogl')
+depends=(glib2 gtk3 lib{gee,granite.so,wnck3} pantheon-notifications)
 makedepends=('meson' 'libgranite.so' 'git' 'vala')
 optdepends=("pantheon-applications-menu-git: Application launcher"
             wingpanel-indicator-{a11y,bluetooth,datetime,keyboard,network,notifications,power,session,sensors,sound}-git": Tray applet"
-            wingpanel-indicator-{ayatana,namarupa}-git": Display Unity 7 tray applets"
-            "indicator-powersave: On the fly power savings and performance toggles"
-            "glippy-indicator: Excellent clipboard manager applet"
-            "ubuntu-indicator-weather: Simple weather applet")
-provides=(wingpanel{,{,-standalone}-bzr,-git} libwingpanel{,-3.0}.so)
+            wingpanel-indicator-{ayatana,namarupa}-git": Display Unity 7 tray applets"})
+provides=(wingpanel{,-git} libwingpanel{,-2.0}.so)
 #provides=(wingpanel{,{,-standalone}-bzr,-git} 'libwingpanel-2.0.so')
-conflicts=(wingpanel{,{,-standalone}-bzr,-git} libwingpanel{,-3.0}.so)
+conflicts=(wingpanel{,-git} libwingpanel{,-2.0}.so)
 #conflicts=(wingpanel{,{,-standalone}-bzr,-git} 'libwingpanel-2.0.so')
 replaces=('wingpanel-standalone-bzr')
 source=('git+https://github.com/elementary/wingpanel.git'