Updated to new git commit

	* Removed udev rule -- now optdepends steam/steamcontroller-udev
	  provides that

	* Removed some conflicts

5 files changed, 20 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dfccd8793ae1..d27031b96a0d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-steamcontroller-git
 	pkgdesc = Standalone userland driver for the Steam controller
-	pkgver = f70b7ea
-	pkgrel = 2
+	pkgver = f8a6316
+	pkgrel = 1
 	url = https://github.com/ynsta/steamcontroller
 	install = steamcontroller.install
 	changelog = changelog.txt
@@ -12,13 +12,12 @@ pkgbase = python-steamcontroller-git
 	depends = python-libusb1
 	optdepends = python-pyside: Required for sc-gyro-plot.py
 	optdepends = python-pyqtgraph: Required for sc-gyro-plot.py
+	optdepends = steamcontroller-udev: udev rules for the controller
+	optdepends = steam: udev rules for the controller
 	provides = steamcontroller
 	conflicts = steamcontroller
-	conflicts = steamcontroller-udev
 	source = git+https://github.com/ynsta/steamcontroller.git
-	source = 99-steamcontroller.rules
 	sha256sums = SKIP
-	sha256sums = 46de34b75730482e5276d94f072dd1911c48789f4442a41c56653b2db05ef46d
 
 pkgname = python-steamcontroller-git
 
diff --git a/99-steamcontroller.rules b/99-steamcontroller.rules
deleted file mode 100644
index 5e91ccd8025b..000000000000
--- a/99-steamcontroller.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-# Steam controller keyboard/mouse mode
-SUBSYSTEM=="usb", ATTRS{idVendor}=="28de", GROUP="games", MODE="0660"
-
-# Steam controller gamepad mode
-KERNEL=="uinput", MODE="0660", GROUP="games", OPTIONS+="static_node=uinput"
diff --git a/PKGBUILD b/PKGBUILD
index 220ff8f4d1f6..2555851393e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: vorpalblade77@gmail.com
 pkgname=python-steamcontroller-git
 _pkgname=steamcontroller
-pkgver=f70b7ea
-pkgrel=2
+pkgver=f8a6316
+pkgrel=1
 pkgdesc="Standalone userland driver for the Steam controller"
 arch=('i686' 'x86_64')
 url="https://github.com/ynsta/${_pkgname}"
@@ -10,14 +10,14 @@ license=('MIT')
 makedepends=('python-distutils-extra')
 depends=('python-libusb1')
 optdepends=('python-pyside: Required for sc-gyro-plot.py'
-	'python-pyqtgraph: Required for sc-gyro-plot.py')
+	'python-pyqtgraph: Required for sc-gyro-plot.py'
+	'steamcontroller-udev: udev rules for the controller'
+	'steam: udev rules for the controller')
 provides=('steamcontroller')
-conflicts=("${_pkgname}" 'steamcontroller-udev')
+conflicts=("${_pkgname}")
 changelog=('changelog.txt')
-source=("git+https://github.com/ynsta/${_pkgname}.git"
-	"99-steamcontroller.rules")
-sha256sums=('SKIP'
-            '46de34b75730482e5276d94f072dd1911c48789f4442a41c56653b2db05ef46d')
+source=("git+https://github.com/ynsta/${_pkgname}.git")
+sha256sums=('SKIP')
 install='steamcontroller.install'
 
 pkgver() {
@@ -31,8 +31,8 @@ build() {
 }
 
 package() {
-	install -m755 -d "${pkgdir}/usr/lib/udev/rules.d"
-	install -Dm 644 "99-steamcontroller.rules" "${pkgdir}/usr/lib/udev/rules.d/99-steamcontroller.rules"
+	#install -m755 -d "${pkgdir}/usr/lib/udev/rules.d"
+	#install -Dm 644 "99-steamcontroller.rules" "${pkgdir}/usr/lib/udev/rules.d/99-steamcontroller.rules"
 	cd "${srcdir}/${_pkgname}"
 	python setup.py install --root="${pkgdir}" \
 	--prefix="/usr" \
diff --git a/changelog.txt b/changelog.txt
index 9c45884b8747..966700c73dd4 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,8 @@
-Git commit  f70b7ea
+Git commit f8a6316
+	* NEW: Haptics have been added
+	* Removed: udev rule -- appears to work without it when STEAM is
+	  installed.
+Git commit f70b7ea
 	* NEW: sc-desktop.py gives desktop keyboard/mouse
 	* Removed: optional dependencies (kodi, evtest) as it is no longer
 	needed.
diff --git a/steamcontroller.install b/steamcontroller.install
index ee7ccfbe1f8b..9b03e18d741f 100644
--- a/steamcontroller.install
+++ b/steamcontroller.install
@@ -6,6 +6,7 @@ post_install() {
 EOF
   udevadm control --reload
   /bin/cat <<EOF
+==> Install either "steam" or "steamcontroller-udev" for the udev rules.
 ==> You can use the controller in xbox360 mode or desktop mode
     $ sc-xbox.py start
 ==> or