summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Riches2016-11-29 00:32:11 +0000
committerJoseph Riches2016-11-29 00:32:11 +0000
commit2ee7e5c46e1862040fc228e015aa5681e9964677 (patch)
tree3a1d157ce5c906523bba8b371ddea2340bf9686c
parent56b362694a9d2f16ba7868d011b6dd52504fab14 (diff)
downloadaur-2ee7e5c46e1862040fc228e015aa5681e9964677.tar.gz
libevdevc: fix derp
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD28
2 files changed, 6 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bbc419cf5c8a..92cabd5284b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = libevdevc-git
pkgdesc = Chromium OS libevdev
pkgver = 2.0
- pkgrel = 1
- url = https://github.com/hugegreenbug/libevdevc
+ pkgrel = 2
+ url = https://github.com/galliumos/libevdevc
arch = i686
arch = x86_64
license = custom:chromiumos
@@ -13,7 +13,7 @@ pkgbase = libevdevc-git
makedepends = doxygen
depends = glibc
conflicts = libevdevc
- source = libevdevc::git+https://github.com/hugegreenbug/libevdevc.git
+ source = libevdevc::git+https://github.com/galliumos/libevdevc.git
md5sums = SKIP
pkgname = libevdevc-git
diff --git a/PKGBUILD b/PKGBUILD
index 7969a21ef093..e620ca6b1488 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,10 @@
-<<<<<<< HEAD
-pkgname=libevdevc-git
-=======
# Maintained by Joseph Riches
-pkgname=libevdevc
->>>>>>> 18d5502329cdf2ab75d81e9ad9e4210ed6be2e50
+pkgname=libevdevc-git
pkgdesc="Chromium OS libevdev"
pkgver=2.0
-pkgrel=1
+pkgrel=2
arch=(i686 x86_64)
-<<<<<<< HEAD
url="https://github.com/galliumos/libevdevc"
license=('custom:chromiumos')
_gitname='libevdevc'
@@ -33,22 +28,5 @@ check() {
package() {
make -C "$srcdir/$_gitname" DESTDIR="${pkgdir}" install
-=======
-url="https://github.com/hugegreenbug/libevdevc"
-license=('custom:chromiumos')
-depends=('glibc')
-options=('!emptydirs' '!strip')
-
-source=('ChromiumOS_Licence.txt')
-source_x86_64=("${pkgname}_${pkgver}-ubuntu4_amd64.deb::https://launchpad.net/~hugegreenbug/+archive/ubuntu/cmt2/+files/${pkgname}_${pkgver}-ubuntu4_amd64.deb")
-source_i686=("${pkgname}_${pkgver}-ubuntu4_i386.deb::https://launchpad.net/~hugegreenbug/+archive/ubuntu/cmt2/+files/${pkgname}_${pkgver}-ubuntu4_i386.deb")
-
-md5sums=('af314be4bf04a749665a07203b120f54')
-md5sums_x86_64=('f76beab95337525666e03789bd250c24')
-md5sums_i686=('287715207a88d3f213a80d15332133a6')
-
-package() {
- bsdtar -xf data.tar.xz -C "$pkgdir/"
- install -Dm644 ChromiumOS_Licence.txt "$pkgdir"/usr/share/licenses/${pkgname}/LICENCE
->>>>>>> 18d5502329cdf2ab75d81e9ad9e4210ed6be2e50
}
+