From e5138f2628b67c76f452c64466db49d32008f444 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <dustin.kirkland@gmail.com>
Date: Mon, 14 Jan 2013 14:54:08 -0600
Subject: [PATCH] * usr/lib/byobu/include/dirs: LP: #1025998   - more XDG
 annoyances   - use $HOME/.config/byobu as BYOBU_CONFIG_DIR if it exists

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

diff --git a/debian/changelog b/debian/changelog
index 38052194..3035ae1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ byobu (5.27) unreleased; urgency=low
   * usr/bin/byobu: LP: #1026595
     - fix readlink detection; we were using BYOBU_TEST before it was defined
     - instead, try to greadlink -f .; operationally the same
+  * usr/lib/byobu/include/dirs: LP: #1025998
+    - more XDG annoyances
+    - use $HOME/.config/byobu as BYOBU_CONFIG_DIR if it exists
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 10 Jan 2013 16:36:23 -0600
 
diff --git a/usr/lib/byobu/include/dirs b/usr/lib/byobu/include/dirs
index 8ca20cd5..3ca53d1d 100755
--- a/usr/lib/byobu/include/dirs
+++ b/usr/lib/byobu/include/dirs
@@ -30,8 +30,11 @@ if [ -d "$BYOBU_CONFIG_DIR" ]; then
 elif [ -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/.config/$PKG" ]; then
+	# Use XDG config directory, if it exists
+	export BYOBU_CONFIG_DIR="$HOME/.config/$PKG"
 elif [ -d "$HOME/.local/share/$PKG" ]; then
-	# Use XDG common directory, if it exists
+	# Use XDG local directory, if it exists
 	export BYOBU_CONFIG_DIR="$HOME/.local/share/$PKG"
 else
 	# And to default to good old classic config dir location!