Fixing metadata; adding conflicts and adjusting header

2 files changed, 9 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c355f85b596..729b50c2df99 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Fri Jul 15 11:44:21 UTC 2016
+# Fri Jul 15 11:56:52 UTC 2016
 pkgbase = upp-nightly
 	pkgdesc = Radical and innovative multiplatform C++ framework (known as U++)
 	pkgver = 10043
@@ -38,6 +38,7 @@ pkgname = upp-nightly
 	arch = any
 	depends = theide
 	optdepends = libnotify: Enables compiling gtk-styled apps
+	conflicts = upp
 	options = emptydirs
 	options = !strip
 
@@ -50,6 +51,7 @@ pkgname = theide-nightly
 	depends = libnotify
 	depends = desktop-file-utils
 	optdepends = sox: Enables notification sounds
+	conflicts = theide
 	options = !makeflags
 	options = emptydirs
 
@@ -59,6 +61,7 @@ pkgname = umk-nightly
 	arch = x86_64
 	depends = gcc-libs
 	depends = desktop-file-utils
+	conflicts = umk
 	options = !makeflags
 	options = emptydirs
 
diff --git a/PKGBUILD b/PKGBUILD
index c8ba84fc6812..f20a3d8d064f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Jan Dolinar <dolik.rce@gmail.com>
+# Maintainer: Brenton Horne <brentonhorne77 at gmail dot com>
+# Contributor: Jan Dolinar <dolik.rce@gmail.com>
 
 pkgbase=upp-nightly
 pkgname=(upp-nightly theide-nightly umk-nightly)
@@ -8,12 +9,8 @@ pkgdesc="Radical and innovative multiplatform C++ framework (known as U++)"
 arch=('any')
 url="http://www.ultimatepp.org"
 license=('BSD')
-groups=()
 depends=('gtk2' 'libnotify' 'libpng' 'gcc-libs' 'libxft' 'desktop-file-utils')
-makedepends=()
 optdepends=('libnotify: Enables compiling gtk-styled apps' 'sox: Enables playing notification sounds')
-replaces=()
-backup=()
 options=(!makeflags emptydirs !strip)
 source=("http://www.ultimatepp.org/downloads/upp-x11-src-$pkgver.tar.gz"
         'GCC.bm'
@@ -59,6 +56,7 @@ package_theide-nightly(){
   # theide specific settings
   pkgdesc="Modern IDE designed for developping large U++/C++ applications"
   arch=('i686' 'x86_64')
+  conflicts=('theide')
   if [ "$USE_NOGTK" = true ]; then
     depends=('libpng' 'gcc-libs' 'libxft' 'libxinerama' 'desktop-file-utils')
     optdepends=('sox: Enables notification sounds')
@@ -90,6 +88,7 @@ package_umk-nightly(){
   # theide specific settings
   pkgdesc="Command line builder for U++ applications"
   arch=('i686' 'x86_64')
+  conflicts=('umk')
   depends=('gcc-libs' 'desktop-file-utils')
   options=(!makeflags emptydirs)
 
@@ -109,6 +108,7 @@ package_upp-nightly() {
   pkgdesc="Radical and innovative multiplatform C++ framework (known as U++)"
   arch=('any')
   depends=('theide')
+  conflicts=('upp')
   optdepends=('libnotify: Enables compiling gtk-styled apps')
   options=(emptydirs !strip)
   #copy source files