alarm/uboot-sunxi to 2014.01-3

alarm/uboot-sunxi/PKGBUILD

@@ -6,7 +6,7 @@ buildarch=4
 pkgbase=uboot-sunxi
 pkgname=('uboot-cubieboard2' 'uboot-cubietruck')
 pkgver=2014.01
-pkgrel=2
+pkgrel=3
 arch=('armv7h')
 url="https://github.com/linux-sunxi/u-boot-sunxi/tree/sunxi-current"
 license=('GPL')
@@ -47,6 +47,7 @@ build() {
 package_uboot-cubieboard2() {
   pkgdesc="U-Boot for Cubieboard 2"
   install=${pkgbase}.install
+  conflicts=('uboot-cubietruck')
 
   mkdir -p "${pkgdir}"/boot
   cp bin_Cubieboard2/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
@@ -58,6 +59,7 @@ package_uboot-cubieboard2() {
 package_uboot-cubietruck() {
   pkgdesc="U-Boot for Cubietruck"
   install=${pkgbase}.install
+  conflicts=('uboot-cubieboard2')
 
   mkdir -p "${pkgdir}"/boot
   cp bin_Cubietruck/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot