cleanup package and deps

3 files changed, 21 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c8b3fb27af81..d7f129d42220 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
 pkgbase = powerline-i3-git
 	pkgdesc = The ultimate statusline/prompt utility. A fork containing more features for the i3 window manager.
-	pkgver = 1.7.2
+	pkgver = 1.7.3
 	pkgrel = 1
 	url = https://github.com/ph111p/powerline
-	install = powerline-i3-git.install
 	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = python-setuptools
 	depends = python
-	depends = powerline-fonts-git
-	depends = lemonbar-xft-git
+	depends = powerline-fonts
 	depends = ttf-font-awesome-4
-	optdepends = i3ipc-python-git: workspace segment
+	depends = lemonbar-xft-git
+	depends = i3ipc-python-git
 	optdepends = wpa_actiond: wireless segment
 	optdepends = wireless_tools: wireless segment
 	optdepends = python-iwlib: wireless segment
@@ -22,6 +21,7 @@ pkgbase = powerline-i3-git
 	optdepends = python-google-api-python-client: Google Calendar support for the appoints segment
 	optdepends = xorg-xrandr: RandR segment
 	optdepends = xorg-xinput: RandR segment
+	optdepends = python-xlib: Use Xlib instead of xrandr
 	provides = powerline-i3
 	conflicts = powerline
 	conflicts = python-powerline
diff --git a/PKGBUILD b/PKGBUILD
index d6d41d51fdeb..f60da78d0ae3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,34 @@
+# Maintainer: Philip Wellnitz
+
 pkgname=powerline-i3-git
 pkgver=1.7.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The ultimate statusline/prompt utility. A fork containing more features for the i3 window manager."
 arch=('i686' 'x86_64')
 url="https://github.com/ph111p/powerline"
 license=('MIT')
 depends=(
   'python'
-  'powerline-fonts-git'
-  'lemonbar-xft-git'
+  'powerline-fonts'
   'ttf-font-awesome-4'
+  'lemonbar-xft-git'
+  'i3ipc-python-git'
+  'xorg-xrandr'
 )
 optdepends=(
-  'i3ipc-python-git: workspace segment'
-  'wpa_actiond: wireless segment'
-  'wireless_tools: wireless segment'
   'python-iwlib: wireless segment'
   'python-pyalsaaudio: volume segment'
   'python-psutil: cpu load segment'
   'python-pygit2: better git performance of the vcs segment'
   'python-google-api-python-client: Google Calendar support for the appoints segment'
-  'xorg-xrandr: RandR segment'
-  'xorg-xinput: RandR segment'
+  'xorg-xinput: screen rotation segment'
+  'python-xlib: Use Xlib instead of xrandr (experimental)'
 )
 makedepends=(
   'python-setuptools'
 )
 provides=('powerline-i3')
 conflicts=('powerline' 'python-powerline')
-install=$pkgname.install
 
 source=("git://github.com/ph111p/powerline.git")
 sha512sums=('SKIP')
@@ -37,4 +37,11 @@ package() {
     cd powerline
 
     python setup.py install --root="${pkgdir}" --optimize=1
+
+    echo ">>> To use powerline instead of i3bar, replace"
+    echo ">>>   bar {"
+    echo ">>>      status_command i3status"
+    echo ">>>   }"
+    echo ">>> in your i3/config with this line:"
+    echo ">>> exec_always \"killall powerline-lemonbar; powerline-lemonbar --i3 --height 16 -- -a 40 -b -f \'DejaVu Sans Mono-11\' -f \'PowerlineSymbols-12\' -f \'FontAwesome-11\'\""
 }
diff --git a/powerline-i3-git.install b/powerline-i3-git.install
deleted file mode 100644
index 0f583002380b..000000000000
--- a/powerline-i3-git.install
+++ /dev/null
@@ -1,8 +0,0 @@
-post_install() {
-  echo ">>> To use powerline instead of i3bar, replace"
-  echo ">>>   bar {"
-  echo ">>>      status_command i3status"
-  echo ">>>   }"
-  echo ">>> in your i3/config with this line:"
-  echo '>>> exec_always "killall powerline-lemonbar; powerline-lemonbar --i3 --clicks --height 16 -- -a 40 -b -f \'DejaVu Sans Mono for Powerline-11\' -f \'FontAwesome-11\'"'
-}