From c242187499a493f29e20bd329a6f48ad5f76e679 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@ubuntu.com>
Date: Thu, 8 Dec 2011 11:06:44 -0600
Subject: [PATCH] * usr/lib/byobu/include/dirs: LP: #780081   - use
 ~/.local/share/byobu as BYOBU_CONFIG_DIR, if it happens to exist

---
 debian/changelog           | 2 ++
 usr/lib/byobu/include/dirs | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 416f3a7e..b2560e1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ byobu (4.53) unreleased; urgency=low
       correct BYOBU_PREFIX value and store it in ~/.byoburc
     - ~/.byoburc is now read by all usr/bin/* in order to find the
       correct prefix
+  * usr/lib/byobu/include/dirs: LP: #780081
+    - use ~/.local/share/byobu as BYOBU_CONFIG_DIR, if it happens to exist
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 05 Dec 2011 08:59:08 -0600
 
diff --git a/usr/lib/byobu/include/dirs b/usr/lib/byobu/include/dirs
index e9a499cd..cdaa70a3 100755
--- a/usr/lib/byobu/include/dirs
+++ b/usr/lib/byobu/include/dirs
@@ -28,8 +28,11 @@ PKG="byobu"
 if [ -d "$XDG_CONFIG_HOME" ]; then
 	# Use XDG, as some users insist on such nonsense :-)
 	export BYOBU_CONFIG_DIR="$XDG_CONFIG_HOME/$PKG"
+elif [ -d "$HOME/.local/share/$PKG" ]; then
+	# Use XDG common directory, if it exists
+	export BYOBU_CONFIG_DIR="$HOME/.local/share/$PKG"
 else
-	# But fall back to classic config dir location
+	# And to default to good old classic config dir location!
 	export BYOBU_CONFIG_DIR="$HOME/.$PKG"
 fi
 [ -d "$BYOBU_CONFIG_DIR" ] || mkdir -p "$BYOBU_CONFIG_DIR"