summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Garillot2016-09-06 15:04:21 +0200
committerFrançois Garillot2016-09-06 15:06:30 +0200
commite1bcb0f2889074848689b58ff594cb11f94e056c (patch)
tree7019268c8ee8d4cf6448218ba11c52d9c80679c3
parentbd4522ce2c1a21efbf8bd1139afede7f2c20ea0f (diff)
downloadaur-e1bcb0f2889074848689b58ff594cb11f94e056c.tar.gz
bump scala version
-rw-r--r--.SRCINFO15
-rw-r--r--PKGBUILD10
2 files changed, 14 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6a36e1349168..cadf3a948dd2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,21 @@
+# Generated by mksrcinfo v8
+# Tue Sep 6 13:06:25 UTC 2016
pkgbase = scala_2.10
pkgdesc = A Java-interoperable language with object-oriented and functional features. This is the maintenance version of Scala 2.10.
- pkgver = 2.10.5
+ pkgver = 2.10.6
pkgrel = 1
url = http://www.scala-lang.org
arch = any
license = BSD
- depends = java-runtime<=7
+ depends = jdk7
conflicts = scala
conflicts = scala-docs
conflicts = scala-sources
- source = http://www.scala-lang.org/files/archive/scala-2.10.5.tgz
- source = http://www.scala-lang.org/files/archive/scala-docs-2.10.5.txz
- md5sums = 79c0f6551ce62d651f700073e654e141
- md5sums = e895c4641ad8fba4b8a983c957bae948
+ conflicts = jdk8
+ source = http://www.scala-lang.org/files/archive/scala-2.10.6.tgz
+ source = http://www.scala-lang.org/files/archive/scala-docs-2.10.6.txz
+ md5sums = d79dc9fdc627b73289306bdaec81ca98
+ md5sums = 0a6a0598e365a4dea2541efa3e9e5ef7
pkgname = scala_2.10
depends = java-runtime<=7
diff --git a/PKGBUILD b/PKGBUILD
index 41e006dc8ba9..9788fb5a923a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,19 +4,19 @@
pkgbase=scala_2.10
pkgname=(scala_2.10 scala-docs_2.10 scala-sources_2.10)
-pkgver=2.10.5
+pkgver=2.10.6
pkgrel=1
pkgdesc="A Java-interoperable language with object-oriented and functional features. This is the maintenance version of Scala 2.10."
arch=('any')
url="http://www.scala-lang.org"
license=('BSD')
# for Java 8 incompatibility, see scala issue SI-8852
-depends=('java-runtime<=7')
-conflicts=('scala' 'scala-docs' 'scala-sources')
+depends=('jdk7')
+conflicts=('scala' 'scala-docs' 'scala-sources' 'jdk8')
source=("http://www.scala-lang.org/files/archive/scala-${pkgver}.tgz"
"http://www.scala-lang.org/files/archive/scala-docs-${pkgver}.txz")
-md5sums=('79c0f6551ce62d651f700073e654e141'
- 'e895c4641ad8fba4b8a983c957bae948')
+md5sums=('d79dc9fdc627b73289306bdaec81ca98'
+ '0a6a0598e365a4dea2541efa3e9e5ef7')
package_scala_2.10() {
depends=('java-runtime<=7')