From 5fa02b42be80ffa722659e6a2690442fac53ab74 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Fri, 7 Dec 2018 16:33:19 -0500
Subject: [PATCH] PKGBUILDs: Merge tari-bspwm with tari-desktop

As ironic as this may sound, less user choice means that there's less
room for error. Plus, it makes things conveniently easier for me and
possibly every other user of the software.
---
 .archlinux/PKGBUILDs/tari-bspwm/PKGBUILD   | 9 ---------
 .archlinux/PKGBUILDs/tari-desktop/PKGBUILD | 8 ++++++--
 2 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 .archlinux/PKGBUILDs/tari-bspwm/PKGBUILD

diff --git a/.archlinux/PKGBUILDs/tari-bspwm/PKGBUILD b/.archlinux/PKGBUILDs/tari-bspwm/PKGBUILD
deleted file mode 100644
index 23b9371f..00000000
--- a/.archlinux/PKGBUILDs/tari-bspwm/PKGBUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-pkgname=tari-bspwm
-pkgver=0.1.0
-pkgrel=2
-pkgdesc="Packages I use specifically for bspwm."
-arch=('any')
-depends=(bspwm
-         sxhkd
-         dunst
-         compton)
diff --git a/.archlinux/PKGBUILDs/tari-desktop/PKGBUILD b/.archlinux/PKGBUILDs/tari-desktop/PKGBUILD
index 1661ab1a..fc023f23 100644
--- a/.archlinux/PKGBUILDs/tari-desktop/PKGBUILD
+++ b/.archlinux/PKGBUILDs/tari-desktop/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=tari-desktop
-pkgver=0.1.1
+pkgver=0.2.0
 pkgrel=1
 pkgdesc="Packages common to all my desktop setups, such as fonts."
 arch=('any')
@@ -30,4 +30,8 @@ depends=(ttf-dejavu
          zathura
          zathura-djvu
          zathura-pdf-mupdf
-         code)
+         code
+         bspwm
+         sxhkd
+         dunst
+         compton)