Use pali's MR 288 again instead of MarijnS95's branch

2 files changed, 24 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f1fb34317a96..78461014432c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pulseaudio-hsphfpd
 	pkgdesc = A fork of pulseaudio providing superior bluetooth headset functionality
-	pkgver = 13.99.2+85+g95460f49e
-	pkgrel = 2
+	pkgver = 13.99.2+96+gbb7408dfa
+	pkgrel = 1
 	url = https://www.freedesktop.org/wiki/Software/PulseAudio/
 	arch = x86_64
 	license = GPL
@@ -39,7 +39,7 @@ pkgbase = pulseaudio-hsphfpd
 
 pkgname = pulseaudio-hsphfpd
 	install = pulseaudio.install
-	depends = libpulse-hsphfpd=13.99.2+85+g95460f49e-2
+	depends = libpulse-hsphfpd=13.99.2+96+gbb7408dfa-1
 	depends = alsa-card-profiles
 	depends = rtkit
 	depends = libltdl
@@ -55,7 +55,7 @@ pkgname = pulseaudio-hsphfpd
 	optdepends = pulseaudio-bluetooth-hsphfpd: Bluetooth support
 	optdepends = pulseaudio-equalizer-hsphfpd: Graphical equalizer
 	optdepends = pulseaudio-rtp-hsphfpd: RTP and RAOP support
-	provides = pulseaudio=13.99.2+85+g95460f49e-2
+	provides = pulseaudio=13.99.2+96+gbb7408dfa-1
 	conflicts = pulseaudio
 	replaces = pulseaudio-xen<=9.0
 	replaces = pulseaudio-gconf<=11.1
@@ -76,58 +76,58 @@ pkgname = libpulse-hsphfpd
 	provides = libpulse.so
 	provides = libpulse-simple.so
 	provides = libpulse-mainloop-glib.so
-	provides = libpulse=13.99.2+85+g95460f49e-2
+	provides = libpulse=13.99.2+96+gbb7408dfa-1
 	conflicts = libpulse
 	backup = etc/pulse/client.conf
 
 pkgname = alsa-card-profiles-hsphfpd
 	pkgdesc = ALSA card profiles shared by PulseAudio
 	license = LGPL
-	provides = alsa-card-profiles=13.99.2+85+g95460f49e-2
+	provides = alsa-card-profiles=13.99.2+96+gbb7408dfa-1
 	conflicts = alsa-card-profiles
 
 pkgname = pulseaudio-zeroconf-hsphfpd
 	pkgdesc = Zeroconf support for PulseAudio
-	depends = pulseaudio-hsphfpd=13.99.2+85+g95460f49e-2
+	depends = pulseaudio-hsphfpd=13.99.2+96+gbb7408dfa-1
 	depends = avahi
 	depends = openssl
-	provides = pulseaudio-zeroconf=13.99.2+85+g95460f49e-2
+	provides = pulseaudio-zeroconf=13.99.2+96+gbb7408dfa-1
 	conflicts = pulseaudio-zeroconf
 
 pkgname = pulseaudio-lirc-hsphfpd
 	pkgdesc = IR (lirc) support for PulseAudio
-	depends = pulseaudio-hsphfpd=13.99.2+85+g95460f49e-2
+	depends = pulseaudio-hsphfpd=13.99.2+96+gbb7408dfa-1
 	depends = lirc
-	provides = pulseaudio-lirc=13.99.2+85+g95460f49e-2
+	provides = pulseaudio-lirc=13.99.2+96+gbb7408dfa-1
 	conflicts = pulseaudio-lirc
 
 pkgname = pulseaudio-jack-hsphfpd
 	pkgdesc = Jack support for PulseAudio
-	depends = pulseaudio-hsphfpd=13.99.2+85+g95460f49e-2
+	depends = pulseaudio-hsphfpd=13.99.2+96+gbb7408dfa-1
 	depends = jack
-	provides = pulseaudio-jack=13.99.2+85+g95460f49e-2
+	provides = pulseaudio-jack=13.99.2+96+gbb7408dfa-1
 	conflicts = pulseaudio-jack
 
 pkgname = pulseaudio-bluetooth-hsphfpd
 	pkgdesc = Bluetooth support for PulseAudio
-	depends = pulseaudio-hsphfpd=13.99.2+85+g95460f49e-2
+	depends = pulseaudio-hsphfpd=13.99.2+96+gbb7408dfa-1
 	depends = bluez
 	depends = bluez-libs
 	depends = sbc
-	provides = pulseaudio-bluetooth=13.99.2+85+g95460f49e-2
+	provides = pulseaudio-bluetooth=13.99.2+96+gbb7408dfa-1
 	conflicts = pulseaudio-bluetooth
 
 pkgname = pulseaudio-equalizer-hsphfpd
 	pkgdesc = Graphical equalizer for PulseAudio
-	depends = pulseaudio-hsphfpd=13.99.2+85+g95460f49e-2
+	depends = pulseaudio-hsphfpd=13.99.2+96+gbb7408dfa-1
 	depends = python-pyqt5
 	depends = python-dbus
 	depends = fftw
-	provides = pulseaudio-equalizer=13.99.2+85+g95460f49e-2
+	provides = pulseaudio-equalizer=13.99.2+96+gbb7408dfa-1
 	conflicts = pulseaudio-equalizer
 
 pkgname = pulseaudio-rtp-hsphfpd
 	pkgdesc = RTP and RAOP support for PulseAudio
-	depends = pulseaudio=13.99.2+85+g95460f49e-2
+	depends = pulseaudio=13.99.2+96+gbb7408dfa-1
 	depends = gst-plugins-base-libs
 
diff --git a/PKGBUILD b/PKGBUILD
index 7d3f3a5c3451..eb5952db84b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 pkgbase=pulseaudio-hsphfpd
 pkgname=(pulseaudio-hsphfpd libpulse-hsphfpd alsa-card-profiles-hsphfpd pulseaudio-{zeroconf,lirc,jack,bluetooth,equalizer,rtp}-hsphfpd)
 pkgdesc="A fork of pulseaudio providing superior bluetooth headset functionality"
-pkgver=13.99.2+85+g95460f49e
-pkgrel=2
+pkgver=13.99.2+96+gbb7408dfa
+pkgrel=1
 arch=(x86_64)
 url="https://www.freedesktop.org/wiki/Software/PulseAudio/"
 license=(GPL)
@@ -25,13 +25,13 @@ pkgver() {
 prepare() {
   cd pulseaudio
 
-  git fetch "https://gitlab.freedesktop.org/MarijnS95/pulseaudio.git" "absolute-volume-on-hsphfpd"
-  git checkout -B "MarijnS95/pulseaudio-absolute-volume-on-hsphfpd" FETCH_HEAD
-  git checkout master
-  git merge --ff -m "Merge branch 'MarijnS95/pulseaudio-absolute-volume-on-hsphfpd' into master" "MarijnS95/pulseaudio-absolute-volume-on-hsphfpd"
-
   # Freeze version before patching
   ./git-version-gen doesnt-exist >.tarball-version
+
+  git fetch "https://gitlab.freedesktop.org/pali/pulseaudio.git" "hsphfpd"
+  git checkout -B "pali/hsphfpd" FETCH_HEAD
+  git checkout master
+  git merge --ff -m "Merge branch 'pali/hsphfpd' into master" "pali/hsphfpd"
 }
 
 build() {