also provide/conflict gala-git

2 files changed, 10 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d71a6b614ce1..c09447a722ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon May 15 14:06:41 UTC 2017
+# Thu May 25 08:45:08 UTC 2017
 pkgbase = pantheon-workarounds
 	pkgdesc = Workarounds for modular and minimal Pantheon Desktop Environments
 	pkgver = 5
-	pkgrel = 4
+	pkgrel = 5
 	url = https://launchpad.net/gala
 	install = gala.install
 	arch = i686
@@ -23,14 +23,17 @@ pkgbase = pantheon-workarounds
 	optdepends = contractor-git: Service for sharing data between apps
 	optdepends = pantheon-print-git: Print settings dialog
 	optdepends = pantheon-agent-polkit-bzr: Polkit Authentication Agent
+	optdepends = xscreensaver-dbus-screenlock: xscreensaver locker for gnome-derivative desktops
 	provides = pantheon-session=
 	provides = pantheon-session-bzr=
 	provides = gala=
 	provides = gala-bzr=
+	provides = gala-git=
 	conflicts = pantheon-session
 	conflicts = pantheon-session-bzr
 	conflicts = gala
 	conflicts = gala-bzr
+	conflicts = gala-git
 	source = pantheon-session::bzr+lp:~elementary-os/elementaryos/pantheon-xsession-settings
 	source = pantheon-session.sh
 	source = gnome-fallback-media-keys-helper-pantheon.desktop
diff --git a/PKGBUILD b/PKGBUILD
index fd8607fc714e..a1706fd3d17d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=pantheon-workarounds
 pkgver=5
-pkgrel=4
+pkgrel=5
 pkgdesc='Workarounds for modular and minimal Pantheon Desktop Environments'
 arch=('i686' 'x86_64')
 url='https://launchpad.net/gala'
@@ -15,9 +15,10 @@ depends=('gconf' gnome-{keyring,settings-daemon-{elementary,compat},session}
 optdepends=("pantheon-default-settings-bzr: Pantheon configuration and themeing"
             "contractor-git: Service for sharing data between apps"
             "pantheon-print-git: Print settings dialog"
-            "pantheon-agent-polkit-bzr: Polkit Authentication Agent")
+            "pantheon-agent-polkit-bzr: Polkit Authentication Agent"
+            "xscreensaver-dbus-screenlock: xscreensaver locker for gnome-derivative desktops")
 makedepends=('bzr' 'intltool')
-conflicts=(pantheon-session{,-bzr} gala{,-bzr})
+conflicts=(pantheon-session{,-bzr} gala{,-bzr,-git})
 install='gala.install'
 source=("pantheon-session::bzr+lp:~elementary-os/elementaryos/pantheon-xsession-settings"
         'pantheon-session.sh'
@@ -45,7 +46,7 @@ prepare() {
   # This space reserved for pantheon-default-settings(-bzr)
 }
 
-provides=(pantheon-session{,-bzr}="${pkgverpantheonsession}" gala{,-bzr}="${pkgvergala}")
+provides=(pantheon-session{,-bzr}="${pkgverpantheonsession}" gala{,-bzr,-git}="${pkgvergala}")
 
 package() {
   install -Dm644 {"${srcdir}","${pkgdir}"/usr/share/glib-2.0/schemas}/org.pantheon.desktop.gala.gschema.xml