Reflect upstream changes

2 files changed, 10 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e52652c97853..6735837e8359 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,24 @@
 pkgbase = bunsen-utilities-git
 	pkgdesc = Collection of utility scripts
-	pkgver = r81.dc043ef
+	pkgver = r141.e1caa5d
 	pkgrel = 1
 	url = https://github.com/BunsenLabs/bunsen-utilities
 	arch = any
 	license = GPL3
 	makedepends = git
+	depends = bunsen-common
 	depends = python
+	depends = python2
 	depends = pygtk
 	depends = python-xlib
 	depends = python-lxml
+	depends = yad
 	optdepends = upower: Required for bl-exit
 	optdepends = zenity: Required bl-conkyzen and bl-tint2edit
 	provides = bunsen-utilities
 	conflicts = bunsen-utilities
 	source = bunsen-utilities::git+https://github.com/BunsenLabs/bunsen-utilities.git#branch=master
-	source = https://raw.githubusercontent.com/Unia/bunsen-utilities/master/bl-aerosnap
-	source = https://raw.githubusercontent.com/Unia/bunsen-utilities/rewrite-hotcorners/bl-hotcorners
-	source = bl-hotcorners-syntax.patch
 	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = 2cb280313bd01a391437e4b960142d80
 
 pkgname = bunsen-utilities-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 5a3c7f683a33..5036af41f5cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,29 @@
 # Maintainer: 2ion <dev@2ion.de>
 pkgname=bunsen-utilities-git
-pkgver=r81.dc043ef
+pkgver=r141.e1caa5d
 pkgrel=1
 pkgdesc="Collection of utility scripts"
 arch=('any')
 url="https://github.com/BunsenLabs/bunsen-utilities"
 license=('GPL3')
-depends=('python' 'pygtk' 'python-xlib' 'python-lxml')
+depends=('bunsen-common' 'python' 'python2' 'pygtk' 'python-xlib' 'python-lxml' 'yad')
 optdepends=(\
   'upower: Required for bl-exit' \
   'zenity: Required bl-conkyzen and bl-tint2edit')
 makedepends=('git')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
-source=(\
-  "${pkgname%-git}::git+https://github.com/BunsenLabs/bunsen-utilities.git#branch=master" \
-  'https://raw.githubusercontent.com/Unia/bunsen-utilities/master/bl-aerosnap' \
-  'https://raw.githubusercontent.com/Unia/bunsen-utilities/rewrite-hotcorners/bl-hotcorners' \
-  'bl-hotcorners-syntax.patch')
-md5sums=(\
-  'SKIP' \
-  'SKIP' \
-  'SKIP' \
-  '2cb280313bd01a391437e4b960142d80')
+source=("${pkgname%-git}::git+https://github.com/BunsenLabs/bunsen-utilities.git#branch=master")
+md5sums=(SKIP)
 
 pkgver() {
   cd "$srcdir/${pkgname%-git}"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-  cd "$srcdir/${pkgname%-git}"
-  cd "$srcdir" ; cd ..
-  patch bl-hotcorners bl-hotcorners-syntax.patch
-}
-
 package() {
   cd "$srcdir/${pkgname%-git}"
   install -d "${pkgdir}/usr/bin"
-  install -t "${pkgdir}/usr/bin" bl-*
-  cd "$srcdir"
-  install -t "${pkgdir}/usr/bin" bl-aerosnap
-  install -t "${pkgdir}/usr/bin" bl-hotcorners
+  install -t "${pkgdir}/usr/bin" bin/bl-*
+  install -Dm644 bl-exitrc "${pkgdir}/etc/bl-exit/bl-exitrc"
 }