On pteromys' advice: use dbus service files to create the dbus services; probably healthier than xdg autostarts

4 files changed, 22 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a90d61f2defa..142b232fbc5e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Oct 19 20:57:56 UTC 2016
+# Sat Apr  1 17:20:51 UTC 2017
 pkgbase = xscreensaver-dbus-screenlock
 	pkgdesc = Shell-integrated screen-locking with xscreensaver
-	pkgver = 1
-	pkgrel = 4
+	pkgver = 2
+	pkgrel = 1
 	url = http://ubuntuforums.org/showthread.php?t=1865593&s=1c7f28c50a3f258e1d3404e41f098a0b&p=11418175#post11418175
 	arch = i686
 	arch = x86_64
@@ -11,20 +11,19 @@ pkgbase = xscreensaver-dbus-screenlock
 	depends = xscreensaver
 	depends = python
 	depends = dbus
-	depends = gnome-settings-daemon-compat
 	optdepends = indicator-session: Activate "Lock" from indicator
 	provides = gnome-screensaver
 	provides = light-locker
 	conflicts = gnome-screensaver
 	conflicts = light-locker
 	source = xscreensaver-dbus-screenlock-freedesktop.py
-	source = xscreensaver-dbus-screenlock-freedesktop.desktop
 	source = xscreensaver-dbus-screenlock-gnome.py
-	source = xscreensaver-dbus-screenlock-gnome.desktop
+	source = org.freedesktop.ScreenSaver.service
+	source = org.gnome.ScreenSaver.service
 	md5sums = c7d3d86def974e678f62f5c778e3abfb
-	md5sums = 65a7fb8a4d3e8183009e9caffc3e587a
 	md5sums = a6888ae261adddb56d5ebffbe5487dc7
-	md5sums = 90ebf9aabc89691dd20f70c78506daea
+	md5sums = 9181f92d592549c5506a9722b47b7e94
+	md5sums = 9181f92d592549c5506a9722b47b7e94
 
 pkgname = xscreensaver-dbus-screenlock
 
diff --git a/PKGBUILD b/PKGBUILD
index 182179a5bdc7..77b9b02307ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,32 @@
 # Maintainer: Que Quotion <quequotion@bugmenot.com>
 
 pkgname=xscreensaver-dbus-screenlock
-pkgver=1
-pkgrel=4
+pkgver=2
+pkgrel=1
 pkgdesc="Shell-integrated screen-locking with xscreensaver"
 arch=('i686' 'x86_64')
 url="http://ubuntuforums.org/showthread.php?t=1865593&s=1c7f28c50a3f258e1d3404e41f098a0b&p=11418175#post11418175"
 license=('GPL')
-depends=('xscreensaver' 'python' 'dbus' 'gnome-settings-daemon-compat')
+depends=('xscreensaver' 'python' 'dbus')
 optdepends=('indicator-session: Activate "Lock" from indicator')
 provides=('gnome-screensaver' 'light-locker')
 conflicts=('gnome-screensaver' 'light-locker')
 source=('xscreensaver-dbus-screenlock-freedesktop.py'
-	'xscreensaver-dbus-screenlock-freedesktop.desktop'
         'xscreensaver-dbus-screenlock-gnome.py'
-	'xscreensaver-dbus-screenlock-gnome.desktop')
+        'org.freedesktop.ScreenSaver.service'
+        'org.gnome.ScreenSaver.service')
 md5sums=('c7d3d86def974e678f62f5c778e3abfb'
-         '65a7fb8a4d3e8183009e9caffc3e587a'
          'a6888ae261adddb56d5ebffbe5487dc7'
-         '90ebf9aabc89691dd20f70c78506daea')
+         '9181f92d592549c5506a9722b47b7e94'
+         '9181f92d592549c5506a9722b47b7e94')
 
 package() {
 
   install -Dm755 {${srcdir},${pkgdir}/usr/bin}/xscreensaver-dbus-screenlock-freedesktop.py
   install -Dm755 {${srcdir},${pkgdir}/usr/bin}/xscreensaver-dbus-screenlock-gnome.py
 
-  install -Dm644 {${srcdir},${pkgdir}/etc/xdg/autostart}/xscreensaver-dbus-screenlock-freedesktop.desktop
-  install -Dm644 {${srcdir},${pkgdir}/etc/xdg/autostart}/xscreensaver-dbus-screenlock-gnome.desktop
+  install -Dm644 {${srcdir},${pkgdir}/usr/share/dbus-1/services}/org.freedesktop.ScreenSaver.service
+  install -Dm644 {${srcdir},${pkgdir}/usr/share/dbus-1/services}/org.gnome.ScreenSaver.service
 
   # Redirect stray calls to xscreensaver-command
   install -Ddm755 "${pkgdir}/usr/bin/"
diff --git a/org.freedesktop.ScreenSaver.service b/org.freedesktop.ScreenSaver.service
new file mode 100644
index 000000000000..76ab86d1f680
--- /dev/null
+++ b/org.freedesktop.ScreenSaver.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.ScreenSaver
+Exec=/usr/bin/xscreensaver-dbus-screenlock-freedesktop.py
diff --git a/org.gnome.ScreenSaver.service b/org.gnome.ScreenSaver.service
new file mode 100644
index 000000000000..76ab86d1f680
--- /dev/null
+++ b/org.gnome.ScreenSaver.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.ScreenSaver
+Exec=/usr/bin/xscreensaver-dbus-screenlock-freedesktop.py