pantheon-session-bzr r65-1

3 files changed, 12 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 74587336a223..61991ffa7e41 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sun Dec 13 09:08:02 UTC 2015
 pkgbase = pantheon-session-bzr
 	pkgdesc = The Pantheon Session Handler
-	pkgver = r62
+	pkgver = r65
 	pkgrel = 1
 	url = https://code.launchpad.net/~elementary-os/elementaryos/pantheon-xsession-settings
 	arch = any
@@ -20,9 +22,7 @@ pkgbase = pantheon-session-bzr
 	depends = xdg-user-dirs-gtk
 	optdepends = pantheon-default-settings-bzr
 	source = pantheon-session::bzr+lp:~elementary-os/elementaryos/pantheon-xsession-settings
-	source = pantheon-session.sh
 	sha256sums = SKIP
-	sha256sums = 1e0c8e9403e52614d43ecb920e507ee1e96b1439bb20949ff814741e5e5e2284
 
 pkgname = pantheon-session-bzr
 
diff --git a/PKGBUILD b/PKGBUILD
index 704f165b8db6..be5d3e9e4aa5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Maxime Gauduin <alucryd@archlinux.org>
 
 pkgname=pantheon-session-bzr
-pkgver=r62
+pkgver=r65
 pkgrel=1
 pkgdesc='The Pantheon Session Handler'
 arch=('any')
@@ -13,10 +13,8 @@ depends=('cerbere-bzr' 'gala-bzr' 'gconf' 'gnome-keyring' 'gnome-session'
          'slingshot-launcher-bzr' 'wingpanel-bzr' 'xdg-user-dirs-gtk')
 makedepends=('bzr')
 optdepends=('pantheon-default-settings-bzr')
-source=('pantheon-session::bzr+lp:~elementary-os/elementaryos/pantheon-xsession-settings'
-        'pantheon-session.sh')
-sha256sums=('SKIP'
-            '1e0c8e9403e52614d43ecb920e507ee1e96b1439bb20949ff814741e5e5e2284')
+source=('pantheon-session::bzr+lp:~elementary-os/elementaryos/pantheon-xsession-settings')
+sha256sums=('SKIP')
 
 pkgver() {
   cd pantheon-session
@@ -28,25 +26,20 @@ prepare() {
   cd pantheon-session
 
   sed 's/policykit-1/polkit/' -i autostart/polkit-gnome-authentication-agent-1-pantheon.desktop
-  sed 's|gnome-session --session=pantheon|/usr/bin/pantheon-session|' -i debian/pantheon.desktop
 }
 
 package() {
   cd pantheon-session
 
-  mkdir -p "${pkgdir}"/{etc/xdg,usr/{bin,share/{gnome-session/sessions,pantheon,xsessions}}}
-  cp -dr --no-preserve='ownership' autostart "${pkgdir}/etc/xdg/"
-  cp -dr --no-preserve='ownership' debian/pantheon.desktop "${pkgdir}/usr/share/xsessions/"
-  cp -dr --no-preserve='ownership' debian/pantheon.session "${pkgdir}/usr/share/gnome-session/sessions/"
-  cp -dr --no-preserve='ownership' gconf "${pkgdir}/usr/share/GConf"
-  cp -dr --no-preserve='ownership' unity-greeter "${pkgdir}/usr/share/"
-  cp -dr --no-preserve='ownership' applications "${pkgdir}/usr/share/pantheon/"
+  mkdir -p "${pkgdir}"/{etc/xdg,usr/share/{gnome-session,pantheon}}
+  cp -dr --no-preserve='ownership' applications "${pkgdir}"/usr/share/pantheon/
+  cp -dr --no-preserve='ownership' autostart "${pkgdir}"/etc/xdg/
+  cp -dr --no-preserve='ownership' gnome-session "${pkgdir}"/usr/share/gnome-session/sessions
+  cp -dr --no-preserve='ownership' wayland-sessions "${pkgdir}"/usr/share/
+  cp -dr --no-preserve='ownership' xsessions "${pkgdir}"/usr/share/
 
   find "${pkgdir}" -type d -exec chmod 755 {} +
   find "${pkgdir}" -type f -exec chmod 644 {} +
-
-# gnome-session workaround
-  install -m 755 ../pantheon-session.sh "${pkgdir}"/usr/bin/pantheon-session
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/pantheon-session.sh b/pantheon-session.sh
deleted file mode 100644
index dae0d1018850..000000000000
--- a/pantheon-session.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-export XDG_CURRENT_DESKTOP=Pantheon
-exec gnome-session --session pantheon