resolve conflict

6 files changed, 238 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7555203f837c..e60c68c3f00b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = firestorm
-	pkgdesc = Firestorm is FOSS where you can build & share virtual reality (VR) in OpenSim/SecondLife (P2P). Meet people in 3D! Source build.
+	pkgdesc = Firestorm is FOSS where you can build & share Virtual Reality (VR) in OpenSim/SecondLife (P2P). Meet people in 3D! Source build.
 	pkgver = r57588.7b5a98fba31f
 	pkgrel = 1
 	url = https://www.firestormviewer.org/
diff --git a/.SRCINFO_BACKUP_13017 b/.SRCINFO_BACKUP_13017
new file mode 100644
index 000000000000..b1dfe59fa46c
--- /dev/null
+++ b/.SRCINFO_BACKUP_13017
@@ -0,0 +1,63 @@
+pkgbase = firestorm
+<<<<<<< HEAD
+	pkgdesc = Firestorm is FOSS where you can build & share virtual reality (VR) in OpenSim/SecondLife (P2P). Meet people in 3D! Source build.
+=======
+	pkgdesc = Firestorm is FOSS where you can build & share Virtual Reality (VR) in OpenSim/SecondLife (P2P). Meet people in 3D! Source build.
+>>>>>>> b15c2eb509cfcf40317850a0122bfe3ba7d0a495
+	pkgver = r57588.7b5a98fba31f
+	pkgrel = 1
+	url = https://www.firestormviewer.org/
+	arch = i686
+	arch = x86_64
+	license = LGPL
+	makedepends = cmake
+	makedepends = gcc
+	makedepends = python2-virtualenv
+	makedepends = python2-pip
+	makedepends = mercurial
+	depends = dbus-glib
+	depends = gconf
+	depends = glu
+	depends = gtk2
+	depends = lib32-libidn
+	depends = lib32-libsndfile
+	depends = lib32-util-linux
+	depends = lib32-zlib
+	depends = libgl
+	depends = libidn
+	depends = libjpeg-turbo
+	depends = libpng
+	depends = libxss
+	depends = libxml2
+	depends = mesa
+	depends = nss
+	depends = openal
+	depends = sdl
+	depends = vlc
+	depends = zlib
+	optdepends = alsa-lib: for ALSA support
+	optdepends = pepper-flash: for inworld Flash support
+	optdepends = freealut: for OpenAL support
+	optdepends = gstreamer: For video support - may need good, bad and ugly plugins
+	optdepends = lib32-libidn11: for voice support
+	optdepends = libpulse: for PulseAudio support
+	optdepends = mesa-libgl: For Intel, Radeon, Nouveau support
+	optdepends = nvidia-libgl: for NVIDIA support
+	optdepends = nvidia-utils: for NVIDIA support
+	provides = firestorm
+	conflicts = firestorm-bin
+	conflicts = firestorm-beta
+	conflicts = firestorm-nightly
+	source = firestorm::hg+http://hg.phoenixviewer.com/phoenix-firestorm-release
+	source = autovars
+	source = firestorm.desktop
+	source = firestorm.launcher
+	source = dontTarSelf.patch
+	md5sums = SKIP
+	md5sums = 7245883fbdba303d4f827f60907574c6
+	md5sums = 5e3dade65948533ff8412da776029179
+	md5sums = 3daa9e24492337e62bcac318df4ab370
+	md5sums = 5ce1e87b6cbdd300d52906de7444f264
+
+pkgname = firestorm
+
diff --git a/.SRCINFO_BASE_13017 b/.SRCINFO_BASE_13017
new file mode 100644
index 000000000000..9ae10b044e59
--- /dev/null
+++ b/.SRCINFO_BASE_13017
@@ -0,0 +1,57 @@
+pkgbase = firestorm
+	pkgdesc = Firestorm is FOSS where you can build & share virtual reality (VR) in Secondlife/OpenSim (P2P). Meet people in 3D! Source build.
+	pkgver = r57588.7b5a98fba31f
+	pkgrel = 1
+	url = https://www.firestormviewer.org/
+	arch = i686
+	arch = x86_64
+	license = LGPL
+	makedepends = cmake
+	makedepends = gcc
+	makedepends = python2-virtualenv
+	makedepends = python2-pip
+	makedepends = mercurial
+	depends = dbus-glib
+	depends = gconf
+	depends = glu
+	depends = gtk2
+	depends = lib32-libidn
+	depends = lib32-libsndfile
+	depends = lib32-util-linux
+	depends = lib32-zlib
+	depends = libgl
+	depends = libidn
+	depends = libjpeg-turbo
+	depends = libpng
+	depends = libxss
+	depends = libxml2
+	depends = mesa
+	depends = nss
+	depends = openal
+	depends = sdl
+	depends = vlc
+	depends = zlib
+	optdepends = alsa-lib: for ALSA support
+	optdepends = pepper-flash: for inworld Flash support
+	optdepends = freealut: for OpenAL support
+	optdepends = gstreamer: For video support - may need good, bad and ugly plugins
+	optdepends = lib32-libidn11: for voice support
+	optdepends = libpulse: for PulseAudio support
+	optdepends = mesa-libgl: For Intel, Radeon, Nouveau support
+	optdepends = nvidia-libgl: for NVIDIA support
+	optdepends = nvidia-utils: for NVIDIA support
+	provides = firestorm
+	conflicts = firestorm-bin
+	conflicts = firestorm-beta
+	conflicts = firestorm-nightly
+	source = firestorm::hg+http://hg.phoenixviewer.com/phoenix-firestorm-release
+	source = autovars
+	source = firestorm.desktop
+	source = firestorm.launcher
+	md5sums = SKIP
+	md5sums = 7245883fbdba303d4f827f60907574c6
+	md5sums = 5e3dade65948533ff8412da776029179
+	md5sums = 3daa9e24492337e62bcac318df4ab370
+
+pkgname = firestorm
+
diff --git a/.SRCINFO_LOCAL_13017 b/.SRCINFO_LOCAL_13017
new file mode 100644
index 000000000000..7555203f837c
--- /dev/null
+++ b/.SRCINFO_LOCAL_13017
@@ -0,0 +1,59 @@
+pkgbase = firestorm
+	pkgdesc = Firestorm is FOSS where you can build & share virtual reality (VR) in OpenSim/SecondLife (P2P). Meet people in 3D! Source build.
+	pkgver = r57588.7b5a98fba31f
+	pkgrel = 1
+	url = https://www.firestormviewer.org/
+	arch = i686
+	arch = x86_64
+	license = LGPL
+	makedepends = cmake
+	makedepends = gcc
+	makedepends = python2-virtualenv
+	makedepends = python2-pip
+	makedepends = mercurial
+	depends = dbus-glib
+	depends = gconf
+	depends = glu
+	depends = gtk2
+	depends = lib32-libidn
+	depends = lib32-libsndfile
+	depends = lib32-util-linux
+	depends = lib32-zlib
+	depends = libgl
+	depends = libidn
+	depends = libjpeg-turbo
+	depends = libpng
+	depends = libxss
+	depends = libxml2
+	depends = mesa
+	depends = nss
+	depends = openal
+	depends = sdl
+	depends = vlc
+	depends = zlib
+	optdepends = alsa-lib: for ALSA support
+	optdepends = pepper-flash: for inworld Flash support
+	optdepends = freealut: for OpenAL support
+	optdepends = gstreamer: For video support - may need good, bad and ugly plugins
+	optdepends = lib32-libidn11: for voice support
+	optdepends = libpulse: for PulseAudio support
+	optdepends = mesa-libgl: For Intel, Radeon, Nouveau support
+	optdepends = nvidia-libgl: for NVIDIA support
+	optdepends = nvidia-utils: for NVIDIA support
+	provides = firestorm
+	conflicts = firestorm-bin
+	conflicts = firestorm-beta
+	conflicts = firestorm-nightly
+	source = firestorm::hg+http://hg.phoenixviewer.com/phoenix-firestorm-release
+	source = autovars
+	source = firestorm.desktop
+	source = firestorm.launcher
+	source = dontTarSelf.patch
+	md5sums = SKIP
+	md5sums = 7245883fbdba303d4f827f60907574c6
+	md5sums = 5e3dade65948533ff8412da776029179
+	md5sums = 3daa9e24492337e62bcac318df4ab370
+	md5sums = 5ce1e87b6cbdd300d52906de7444f264
+
+pkgname = firestorm
+
diff --git a/.SRCINFO_REMOTE_13017 b/.SRCINFO_REMOTE_13017
new file mode 100644
index 000000000000..46cb09304b1f
--- /dev/null
+++ b/.SRCINFO_REMOTE_13017
@@ -0,0 +1,57 @@
+pkgbase = firestorm
+	pkgdesc = Firestorm is FOSS where you can build & share Virtual Reality (VR) in OpenSim/SecondLife (P2P). Meet people in 3D! Source build.
+	pkgver = r57588.7b5a98fba31f
+	pkgrel = 1
+	url = https://www.firestormviewer.org/
+	arch = i686
+	arch = x86_64
+	license = LGPL
+	makedepends = cmake
+	makedepends = gcc
+	makedepends = python2-virtualenv
+	makedepends = python2-pip
+	makedepends = mercurial
+	depends = dbus-glib
+	depends = gconf
+	depends = glu
+	depends = gtk2
+	depends = lib32-libidn
+	depends = lib32-libsndfile
+	depends = lib32-util-linux
+	depends = lib32-zlib
+	depends = libgl
+	depends = libidn
+	depends = libjpeg-turbo
+	depends = libpng
+	depends = libxss
+	depends = libxml2
+	depends = mesa
+	depends = nss
+	depends = openal
+	depends = sdl
+	depends = vlc
+	depends = zlib
+	optdepends = alsa-lib: for ALSA support
+	optdepends = pepper-flash: for inworld Flash support
+	optdepends = freealut: for OpenAL support
+	optdepends = gstreamer: For video support - may need good, bad and ugly plugins
+	optdepends = lib32-libidn11: for voice support
+	optdepends = libpulse: for PulseAudio support
+	optdepends = mesa-libgl: For Intel, Radeon, Nouveau support
+	optdepends = nvidia-libgl: for NVIDIA support
+	optdepends = nvidia-utils: for NVIDIA support
+	provides = firestorm
+	conflicts = firestorm-bin
+	conflicts = firestorm-beta
+	conflicts = firestorm-nightly
+	source = firestorm::hg+http://hg.phoenixviewer.com/phoenix-firestorm-release
+	source = autovars
+	source = firestorm.desktop
+	source = firestorm.launcher
+	md5sums = SKIP
+	md5sums = 7245883fbdba303d4f827f60907574c6
+	md5sums = 5e3dade65948533ff8412da776029179
+	md5sums = 3daa9e24492337e62bcac318df4ab370
+
+pkgname = firestorm
+
diff --git a/PKGBUILD b/PKGBUILD
index 536866494a8e..0822986a5316 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=firestorm
 pkgver=r57588.7b5a98fba31f
 pkgrel=1
-pkgdesc="Firestorm is FOSS where you can build & share virtual reality (VR) in OpenSim/SecondLife (P2P). Meet people in 3D! Source build."
+pkgdesc="Firestorm is FOSS where you can build & share Virtual Reality (VR) in OpenSim/SecondLife (P2P). Meet people in 3D! Source build."
 arch=('i686' 'x86_64')
 url=https://www.firestormviewer.org/
 license=('LGPL')