summarylogtreecommitdiffstats
path: root/.SRCINFO
diff options
context:
space:
mode:
authorDonald Carr2016-03-03 18:43:35 -0800
committerDonald Carr2016-03-03 18:43:35 -0800
commitd5ca08aac4f24b71804ce53b6cc7bc941b22265d (patch)
tree0b9559688ccee9d784af46213721a986c8f0181e /.SRCINFO
parent4e4ef8d615e07897df8be891e0d2e08b34d11df4 (diff)
parent6107af538fba38ac958c4a961c43b940e222eaad (diff)
downloadaur-d5ca08aac4f24b71804ce53b6cc7bc941b22265d.tar.gz
Resolve conflicts
Merge remote-tracking branch 'pi2/master' Change-Id: I41e2643ec4992dd9f9670694a0de19e862d9e270
Diffstat (limited to '.SRCINFO')
-rw-r--r--.SRCINFO17
1 files changed, 10 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 30e29f0bc85..609dc03f41f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed Jan 27 21:12:06 UTC 2016
-pkgbase = qt-sdk-raspberry-pi1
- pkgdesc = Qt SDK for the Raspberry Pi1
+# Fri Mar 4 02:43:21 UTC 2016
+pkgbase = qt-sdk-raspberry-pi2
+ pkgdesc = Qt SDK for the Raspberry Pi2
pkgver = 5.6.0
- pkgrel = 5
+ pkgrel = 9
url = http://www.qt.io
install = qpi.install
arch = x86_64
@@ -14,11 +14,14 @@ pkgbase = qt-sdk-raspberry-pi1
makedepends = gcc
depends = qpi-toolchain
depends = qtcreator
+ provides = qt-sdk-raspberry-pi2
+ conflicts = qt-sdk-raspberry-pi2
+ replaces = qt-sdk-raspberry-pi2
options = !strip
source = git://github.com/sirspudd/mkspecs.git
- source = https://download.qt.io/development_releases/qt/5.6/5.6.0-beta/single/qt-everywhere-opensource-src-5.6.0-beta.tar.gz
+ source = https://download.qt.io/development_releases/qt/5.6/5.6.0-rc/single/qt-everywhere-opensource-src-5.6.0-rc.7z
sha256sums = SKIP
- sha256sums = d69103ec34b3775edfa47581b14ee9a20789d4b0d7d26220fb92f2cd32eb06f9
+ sha256sums = 82ed4bc1bf7735747e1612f322f8723dfd84f05fa4dca9398863e6527a0c1971
-pkgname = qt-sdk-raspberry-pi1
+pkgname = qt-sdk-raspberry-pi2