remove polkit-gnome (cautiously); add an xdg startup for numlockx; recommend numlockx and bamf-ubuntu-bzr

2 files changed, 9 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b24d862d59ae..fc9c114beccc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Jan  8 15:33:00 UTC 2018
+# Mon Jan  8 19:20:27 UTC 2018
 pkgbase = pantheon-workarounds
 	pkgdesc = Workarounds for modular and minimal Pantheon Desktop Environments
 	pkgver = 7
-	pkgrel = 1
+	pkgrel = 2
 	url = https://launchpad.net/gala
 	install = gala.install
 	arch = i686
@@ -14,7 +14,6 @@ pkgbase = pantheon-workarounds
 	makedepends = intltool
 	depends = gnome-settings-daemon-elementary
 	depends = gnome-settings-daemon-compat
-	depends = polkit-gnome
 	depends = pantheon-session-git
 	optdepends = pantheon-default-settings-git: Pantheon configuration and themeing
 	optdepends = contractor-git: A desktop-wide extension service
@@ -23,6 +22,7 @@ pkgbase = pantheon-workarounds
 	optdepends = pantheon-geoclue2-agent-git: Pantheon Geoclue2 Agent
 	optdepends = xscreensaver-dbus-screenlock: xscreensaver locker for gnome-derivative desktops
 	optdepends = numlockx: Turn on the numlock key in X11
+	optdepends = bamf-ubuntu-bzr: Application matching framework used by plank
 	provides = gala=
 	provides = gala-bzr=
 	provides = gala-git=
@@ -35,14 +35,12 @@ pkgbase = pantheon-workarounds
 	source = gnome-fallback-background-helper-pantheon.desktop
 	source = gnome-fallback-mount-helper-pantheon.desktop
 	source = numlockx-pantheon.desktop
-	source = xsessions-typo.patch
 	sha512sums = 30a488431a23ff5521a12e97fa69ed17b2033ba8f016bb922e07ad9bf2d671e14a90a38266de1567c4dcbf178b6919a8108fad3dd13e50573018dc2a8e9b070e
 	sha512sums = 2f7b9769c97ca79f61c4eaa0c894f6085e0183025de319d9045f771355f605f234ab53ff1e19d5afc42547b46a4c7b732444cd93b5b9ccc7d56588b72d2bebd9
 	sha512sums = b01a18bb7829eb7a48b72c90bdf5aa5913c24247426e0bfc509cba22f49d2d8c9eb301e1937b70f3f7f01a873c987e0bdea6dd5f24f8d900b952188fa5635d39
 	sha512sums = 0df6355d85d2329e245593408a74d09281c0dcea206ed594a7312b78db4d3cd57941a5ec29be780f965128fe512532edae85ffaf11a94b57374d5906875967fc
 	sha512sums = c06e3b8c59681ebe64fa0dd724eea1d40a579956372ce0851f30ededdda3ac41d329d40e5463bd779daba0d55853faec357203b042a4de3d601eafc8b09c350e
 	sha512sums = bc5724ef255adad39e35e3fbd7beacbd3ea270c7019362ff6a8bc15cf8f503a4304c18c5e35ae2a6ddb8d1e6e7cc6973642a2ffdc8fe9e219c7f2dbacf5eab72
-	sha512sums = 09248891b1f5dc41add3ded2150e564b86dc11eee4a695fa8eea11b51e040ca1daaa28701f791d681c88d8869821b7304e2d11eb771d439d13b708e893702108
 
 pkgname = pantheon-workarounds
 
diff --git a/PKGBUILD b/PKGBUILD
index c4375aeed489..2a839cca0a6d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,21 +4,21 @@
 
 pkgname=pantheon-workarounds
 pkgver=7
-pkgrel=1
+pkgrel=2
 pkgdesc='Workarounds for modular and minimal Pantheon Desktop Environments'
 arch=('i686' 'x86_64')
 url='https://launchpad.net/gala'
 license=('GPL3')
 groups=('pantheon-qq')
-depends=(gnome-settings-daemon-{elementary,compat}
-         'polkit-gnome' 'pantheon-session-git')
+depends=(gnome-settings-daemon-{elementary,compat} 'pantheon-session-git')
 optdepends=("pantheon-default-settings-git: Pantheon configuration and themeing"
             "contractor-git: A desktop-wide extension service"
             "pantheon-print-git: Print settings dialog"
             "pantheon-polkit-agent-git: Polkit Authentication Agent"
             "pantheon-geoclue2-agent-git: Pantheon Geoclue2 Agent"
             "xscreensaver-dbus-screenlock: xscreensaver locker for gnome-derivative desktops"
-            "numlockx: Turn on the numlock key in X11")
+            "numlockx: Turn on the numlock key in X11"
+            "bamf-ubuntu-bzr: Application matching framework used by plank")
 makedepends=('git' 'intltool')
 conflicts=(gala{,-bzr,-git})
 install='gala.install'
@@ -27,15 +27,13 @@ source=("https://raw.githubusercontent.com/elementary/gala/master/data/org.panth
         'gnome-fallback-media-keys-helper-pantheon.desktop'
         'gnome-fallback-background-helper-pantheon.desktop'
         'gnome-fallback-mount-helper-pantheon.desktop'
-        'numlockx-pantheon.desktop'
-        'xsessions-typo.patch')
+        'numlockx-pantheon.desktop')
 sha512sums=('30a488431a23ff5521a12e97fa69ed17b2033ba8f016bb922e07ad9bf2d671e14a90a38266de1567c4dcbf178b6919a8108fad3dd13e50573018dc2a8e9b070e'
             '2f7b9769c97ca79f61c4eaa0c894f6085e0183025de319d9045f771355f605f234ab53ff1e19d5afc42547b46a4c7b732444cd93b5b9ccc7d56588b72d2bebd9'
             'b01a18bb7829eb7a48b72c90bdf5aa5913c24247426e0bfc509cba22f49d2d8c9eb301e1937b70f3f7f01a873c987e0bdea6dd5f24f8d900b952188fa5635d39'
             '0df6355d85d2329e245593408a74d09281c0dcea206ed594a7312b78db4d3cd57941a5ec29be780f965128fe512532edae85ffaf11a94b57374d5906875967fc'
             'c06e3b8c59681ebe64fa0dd724eea1d40a579956372ce0851f30ededdda3ac41d329d40e5463bd779daba0d55853faec357203b042a4de3d601eafc8b09c350e'
-            'bc5724ef255adad39e35e3fbd7beacbd3ea270c7019362ff6a8bc15cf8f503a4304c18c5e35ae2a6ddb8d1e6e7cc6973642a2ffdc8fe9e219c7f2dbacf5eab72'
-            '09248891b1f5dc41add3ded2150e564b86dc11eee4a695fa8eea11b51e040ca1daaa28701f791d681c88d8869821b7304e2d11eb771d439d13b708e893702108')
+            'bc5724ef255adad39e35e3fbd7beacbd3ea270c7019362ff6a8bc15cf8f503a4304c18c5e35ae2a6ddb8d1e6e7cc6973642a2ffdc8fe9e219c7f2dbacf5eab72')
 
 prepare() {
   cd "${srcdir}"