desktop/subtle: Fix consolekit xinitrc, cleanups.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

5 files changed, 18 insertions, 12 deletions

diff --git a/desktop/subtle/README b/desktop/subtle/README
index d1bb93dbe601..45cf88b66d31 100644
--- a/desktop/subtle/README
+++ b/desktop/subtle/README
@@ -1,9 +1,9 @@
 subtle (ruby based tiling WM)
 
-A grid-based manual tiling window manager with a strong focus on easy
-but customizable look and feel Subtle has a rather uncommon approach of
-tiling: Per default there is no typical layout enforcement, windows are
-placed on a position (gravity) in a custom grid. The user can change the
-gravity of each window either directly per grabs or with rules defined
-by tags in the config.
-
+A grid-based manual tiling window manager with a strong focus on
+easy but customizable look and feel
+Subtle has a rather uncommon approach of tiling: Per default there is
+no typical layout enforcement, windows are placed on a position
+(gravity) in a custom grid. The user can change the gravity of each
+window either directly per grabs or with rules defined by tags
+in the config.
diff --git a/desktop/subtle/slack-desc b/desktop/subtle/slack-desc
index 582b0be823e9..1118875b1a75 100644
--- a/desktop/subtle/slack-desc
+++ b/desktop/subtle/slack-desc
@@ -9,7 +9,7 @@
 subtle: subtle (ruby based tiling WM)
 subtle:
 subtle: A grid-based manual tiling window manager with a strong focus on
-subtle: easy but customizable look and feel.
+subtle: easy but customizable look and feel
 subtle:
 subtle: Homepage: http://subforge.org/projects/subtle
 subtle:
diff --git a/desktop/subtle/subtle.SlackBuild b/desktop/subtle/subtle.SlackBuild
index e398ea5cc2a2..010dd93f17b5 100644
--- a/desktop/subtle/subtle.SlackBuild
+++ b/desktop/subtle/subtle.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for subtle
 
+# Copyright 2012  Vincent Batts, Raleigh, NC, USA
 # Copyright 2011  Vincent Batts, vbatts@hashbangbash.com, http://hashbangbash.com/
 # All rights reserved.
 #
@@ -24,7 +25,7 @@
 
 PRGNAM=subtle
 VERSION=${VERSION:-0.11.3224_xi}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 SRCVERSION=$(echo $VERSION | tr '_' '-')
@@ -59,7 +60,7 @@ find . \
 
 rake install manprefix=/usr/man destdir=$PKG
 
-mv $PKG/etc/xdg/subtle/subtle.rb{,.new}
+mv $PKG/etc/xdg/subtle/subtle.rb $PKG/etc/xdg/subtle/subtle.rb.new
 
 install -D -m0755 -oroot $CWD/xinitrc.subtle $PKG/etc/X11/xinit/xinitrc.subtle
 install -D -m0644 -oroot $CWD/subtle.desktop $PKG/usr/share/xsessions/subtle.desktop
diff --git a/desktop/subtle/subtle.info b/desktop/subtle/subtle.info
index 399efa9591cc..edc21ba6c48c 100644
--- a/desktop/subtle/subtle.info
+++ b/desktop/subtle/subtle.info
@@ -1,5 +1,5 @@
 PRGNAM="subtle"
-VERSION="0.9.2773_mu"
+VERSION="0.11.3224_xi"
 HOMEPAGE="http://subforge.org/projects/subtle"
 DOWNLOAD="http://subforge.org/attachments/download/81/subtle-0.11.3224-xi.tbz2"
 MD5SUM="e16618291ab14fc05bac6231109ec9f3"
diff --git a/desktop/subtle/xinitrc.subtle b/desktop/subtle/xinitrc.subtle
index f754e34c03ce..7857f652d8aa 100644
--- a/desktop/subtle/xinitrc.subtle
+++ b/desktop/subtle/xinitrc.subtle
@@ -12,5 +12,10 @@ sysmodmap=/etc/X11/xinit/.Xmodmap
 [ -f $userresources ] && xrdb -merge $userresources
 [ -f $usermodmap ] && xmodmap $usermodmap
 
-exec subtle
+# Start the window manager:
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+	exec ck-launch-session dbus-launch --exit-with-session subtle
+else
+	subtle
+fi