Modernize depends(), optdepends(), and provides()

3 files changed, 58 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 399bd0f1d703..e459665a97be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,7 +2,7 @@ pkgbase = pantheon-workarounds
 	pkgdesc = Workarounds for Pantheon derivatives
 	pkgver = 3.2.0.r73.gc49189b
 	pkgrel = 2
-	url = https://github.com/quequotion/pantheon-bzr-qq
+	url = https://github.com/quequotion/pantheon-qq
 	install = gala.install
 	arch = any
 	groups = pantheon-qq
@@ -16,25 +16,31 @@ pkgbase = pantheon-workarounds
 	depends = xdg-user-dirs-gtk
 	depends = pantheon-applications-menu
 	depends = plank
-	depends = wingpanel
+	depends = libwingpanel-2.0=0-64
 	optdepends = contractor: A desktop-wide extension service
+	optdepends = dconf-editor: GUI gsettings editor
+	optdepends = elementary-blue-icon-theme-git: Restore blue folder icons to elementary theme
+	optdepends = file-roller-pantheon: Archive manipulator for GNOME (with elementary OS patches)
+	optdepends = lightdm-gtk-greeter: GTK+ Greeter for LightDM
 	optdepends = numlockx: Turn on the numlock key in X11
-	optdepends = pantheon-dpms-helper: Manage DPMS settigns in place of gnome-settings-daemon
-	optdepends = pantheon-default-settings: Pantheon configuration and themeing
-	optdepends = pantheon-geoclue2-agent-git: Pantheon Geoclue2 Agent
-	optdepends = pantheon-polkit-agent: Polkit Authentication Agent
-	optdepends = pantheon-print: Print settings dialog
-	optdepends = pantheon-screenshot: Screenshot utility
-	optdepends = pantheon-shortcut-overlay: OS-wide shortcut overlay
-	optdepends = simple-scan: Simple scan utility
-	optdepends = switchboard: Pluggable settings manager
+	optdepends = pantheon-calculator: The Pantheon Calculator
+	optdepends = pantheon-calendar: The Pantheon Calendar
+	optdepends = pantheon-code: The Pantheon Code Editor
+	optdepends = pantheon-default-settings: Default settings for Pantheon
+	optdepends = pantheon-dpms-helper: DPMS helper for Pantheon
+	optdepends = pantheon-files: The Pantheon File Browser
+	optdepends = pantheon-geoclue2-agent: Pantheon Geoclue2 Agent
+	optdepends = pantheon-music: The Pantheon Music Player
+	optdepends = pantheon-notifications-git: A Gtk notification server for Pantheon
+	optdepends = pantheon-photos: The Pantheon Photos Manager
+	optdepends = pantheon-polkit-agent: Pantheon Polkit Agent
+	optdepends = pantheon-print: Simple shim for printing support via Contractor
+	optdepends = pantheon-screenshot: The Pantheon Screenshot Tool
+	optdepends = pantheon-terminal: The Pantheon Terminal Emulator
 	optdepends = xscreensaver-dbus-screenlock: xscreensaver locker for gnome-derivative desktops
-	provides = gala=3.2.0.r73.gc49189b
-	provides = gala-bzr=3.2.0.r73.gc49189b
-	provides = gala-git=3.2.0.r73.gc49189b
-	conflicts = gala
-	conflicts = gala-bzr
-	conflicts = gala-git
+	optdepends = wingpanel-standalone-git: Stylish top panel that holds indicators and spawns an application launcher (with autohide and without Gala dependencies)
+	provides = libgala.so=0-64
+	conflicts = libgala.so=0-64
 	source = https://raw.githubusercontent.com/elementary/gala/master/data/org.pantheon.desktop.gala.gschema.xml.in
 	source = pantheon-session-qq
 	source = numlockx-pantheon.desktop
@@ -42,13 +48,13 @@ pkgbase = pantheon-workarounds
 	source = settings.ini
 	source = 26_pantheon-qq-gconf.gschema.override
 	source = .xprofile
-	sha512sums = 30a488431a23ff5521a12e97fa69ed17b2033ba8f016bb922e07ad9bf2d671e14a90a38266de1567c4dcbf178b6919a8108fad3dd13e50573018dc2a8e9b070e
-	sha512sums = 842db1b456c96287865955741ba00c3ceeecf82691700f691d9fc45dc665230f1224ce7cdf5a1301826ab96cfe59e922c3878a5986ab3639da0cb79a2948f727
-	sha512sums = bc5724ef255adad39e35e3fbd7beacbd3ea270c7019362ff6a8bc15cf8f503a4304c18c5e35ae2a6ddb8d1e6e7cc6973642a2ffdc8fe9e219c7f2dbacf5eab72
-	sha512sums = 5481a5784ee687c346fd22751796c0264ce981710dd722d036397afd8423ecf356e5c24b7d348257a04c99af2250f2076c958c069a604db438b61c342359bf05
-	sha512sums = 983fde059024d4456e8bc748862ce20796b339d31fb792dbc30bb6d49345b269b7e6f8dabe04aea139dc8bdb9f88f288506f15343664fec012eff7a07a3fac98
-	sha512sums = 59ff0ac632091ddf9bcbe51785b0664daef005d272b8fd4295fa1fa4d2aead9318126e5e3e9850b7a59d44428511eb9b46e4b3809583023e86c538755e6145f2
-	sha512sums = 372e89fc0cdf1beca7ec56686e2aefc49b576134a28c1d407b809cc9817e0e3196ff6698d45a4b518a1644d7ba7936b93fcc8e6408e55d9db797b81be8f610a5
+	sha256sums = 30a488431a23ff5521a12e97fa69ed17b2033ba8f016bb922e07ad9bf2d671e14a90a38266de1567c4dcbf178b6919a8108fad3dd13e50573018dc2a8e9b070e
+	sha256sums = 842db1b456c96287865955741ba00c3ceeecf82691700f691d9fc45dc665230f1224ce7cdf5a1301826ab96cfe59e922c3878a5986ab3639da0cb79a2948f727
+	sha256sums = bc5724ef255adad39e35e3fbd7beacbd3ea270c7019362ff6a8bc15cf8f503a4304c18c5e35ae2a6ddb8d1e6e7cc6973642a2ffdc8fe9e219c7f2dbacf5eab72
+	sha256sums = 5481a5784ee687c346fd22751796c0264ce981710dd722d036397afd8423ecf356e5c24b7d348257a04c99af2250f2076c958c069a604db438b61c342359bf05
+	sha256sums = 983fde059024d4456e8bc748862ce20796b339d31fb792dbc30bb6d49345b269b7e6f8dabe04aea139dc8bdb9f88f288506f15343664fec012eff7a07a3fac98
+	sha256sums = 59ff0ac632091ddf9bcbe51785b0664daef005d272b8fd4295fa1fa4d2aead9318126e5e3e9850b7a59d44428511eb9b46e4b3809583023e86c538755e6145f2
+	sha256sums = 372e89fc0cdf1beca7ec56686e2aefc49b576134a28c1d407b809cc9817e0e3196ff6698d45a4b518a1644d7ba7936b93fcc8e6408e55d9db797b81be8f610a5
 
 pkgname = pantheon-workarounds
 
diff --git a/PKGBUILD b/PKGBUILD
index 63836e9e50ad..6e88ecadee4f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,40 +4,48 @@
 
 pkgname=pantheon-workarounds
 pkgver=3.2.0.r73.gc49189b
-#pkgver=r1158.5898845
 pkgrel=2
 pkgdesc='Workarounds for Pantheon derivatives'
 arch=('any')
-url='https://github.com/quequotion/pantheon-bzr-qq'
+url='https://github.com/quequotion/pantheon-qq'
 license=('GPL3')
 groups=('pantheon-qq')
-depends=(cinnamon-settings-daemon
-         dconf gnome-{keyring,session} xdg-user-dirs-gtk
-         pantheon-applications-menu plank wingpanel)
+depends=("cinnamon-settings-daemon"
+         "dconf" gnome-{keyring,session} "xdg-user-dirs-gtk"
+         "pantheon-applications-menu" "plank" "libwingpanel-2.0=0-64")
 optdepends=("contractor: A desktop-wide extension service"
+            "dconf-editor: GUI gsettings editor"
+            "elementary-blue-icon-theme-git: Restore blue folder icons to elementary theme"
+            "file-roller-pantheon: Archive manipulator for GNOME (with elementary OS patches)"
+            "lightdm-gtk-greeter: GTK+ Greeter for LightDM"
             "numlockx: Turn on the numlock key in X11"
-            "pantheon-dpms-helper: Manage DPMS settigns in place of gnome-settings-daemon"
-            "pantheon-default-settings: Pantheon configuration and themeing"
-            "pantheon-geoclue2-agent-git: Pantheon Geoclue2 Agent"
-            "pantheon-polkit-agent: Polkit Authentication Agent"
-            "pantheon-print: Print settings dialog"
-            "pantheon-screenshot: Screenshot utility"
-            "pantheon-shortcut-overlay: OS-wide shortcut overlay"
-            "simple-scan: Simple scan utility"
-            "switchboard: Pluggable settings manager"
-            "xscreensaver-dbus-screenlock: xscreensaver locker for gnome-derivative desktops")
+            "pantheon-calculator: The Pantheon Calculator"
+            "pantheon-calendar: The Pantheon Calendar"
+            "pantheon-code: The Pantheon Code Editor"
+            "pantheon-default-settings: Default settings for Pantheon"
+            "pantheon-dpms-helper: DPMS helper for Pantheon"
+            "pantheon-files: The Pantheon File Browser"
+            "pantheon-geoclue2-agent: Pantheon Geoclue2 Agent"
+            "pantheon-music: The Pantheon Music Player"
+            "pantheon-notifications-git: A Gtk notification server for Pantheon"
+            "pantheon-photos: The Pantheon Photos Manager"
+            "pantheon-polkit-agent: Pantheon Polkit Agent"
+            "pantheon-print: Simple shim for printing support via Contractor"
+            "pantheon-screenshot: The Pantheon Screenshot Tool"
+            "pantheon-terminal: The Pantheon Terminal Emulator"
+            "xscreensaver-dbus-screenlock: xscreensaver locker for gnome-derivative desktops"
+            "wingpanel-standalone-git: Stylish top panel that holds indicators and spawns an application launcher (with autohide and without Gala dependencies)")
 makedepends=('git' 'intltool')
-provides=(gala{,-bzr,-git}="${pkgver}")
-conflicts=(gala{,-bzr,-git})
+provides=("libgala.so=0-64")
+conflicts=("libgala.so=0-64")
 install='gala.install'
-source=("https://raw.githubusercontent.com/elementary/gala/master/data/org.pantheon.desktop.gala.gschema.xml.in"
-        'pantheon-session-qq'
+source=("https://raw.githubusercontent.com/elementary/gala/master/data/org.pantheon.desktop.gala.gschema.xml.in"        'pantheon-session-qq'
         'numlockx-pantheon.desktop'
         'gtk.css'
         'settings.ini'
         '26_pantheon-qq-gconf.gschema.override'
         '.xprofile')
-sha512sums=('30a488431a23ff5521a12e97fa69ed17b2033ba8f016bb922e07ad9bf2d671e14a90a38266de1567c4dcbf178b6919a8108fad3dd13e50573018dc2a8e9b070e'
+sha256sums=('30a488431a23ff5521a12e97fa69ed17b2033ba8f016bb922e07ad9bf2d671e14a90a38266de1567c4dcbf178b6919a8108fad3dd13e50573018dc2a8e9b070e'
             '842db1b456c96287865955741ba00c3ceeecf82691700f691d9fc45dc665230f1224ce7cdf5a1301826ab96cfe59e922c3878a5986ab3639da0cb79a2948f727'
             'bc5724ef255adad39e35e3fbd7beacbd3ea270c7019362ff6a8bc15cf8f503a4304c18c5e35ae2a6ddb8d1e6e7cc6973642a2ffdc8fe9e219c7f2dbacf5eab72'
             '5481a5784ee687c346fd22751796c0264ce981710dd722d036397afd8423ecf356e5c24b7d348257a04c99af2250f2076c958c069a604db438b61c342359bf05'
diff --git a/pantheon-session-qq b/pantheon-session-qq
index d34a50dfd4ab..d34a50dfd4ab 100755..100644
--- a/pantheon-session-qq
+++ b/pantheon-session-qq