summaryrefslogtreecommitdiff
path: root/extra/r
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-05-08 11:30:39 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-05-08 11:30:39 -0300
commit0f0bf3b7f0398f0882fa5b7cc3534180cabd9318 (patch)
tree968fcbe1bf470403a1ef1f4c261c0f1e8cf6b022 /extra/r
parente17d7021b82d5a27e1a236d14dd7a8567669e273 (diff)
parentfe6dc99352fe2b801d251e55b2b8baa71441908e (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: extra/fyre/PKGBUILD extra/gnet/PKGBUILD extra/kdeedu/PKGBUILD extra/mhash/PKGBUILD extra/rxvt-unicode/PKGBUILD
Diffstat (limited to 'extra/r')
-rw-r--r--extra/r/PKGBUILD8
-rw-r--r--extra/r/r.desktop3
2 files changed, 5 insertions, 6 deletions
diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index e11458b3c..9461d374d 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 111269 2011-02-25 16:10:57Z ronald $
+# $Id: PKGBUILD 122820 2011-05-06 10:48:44Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
# Contributor: K. Piche <kpiche@rogers.com>
pkgname=r
-pkgver=2.12.2
+pkgver=2.13.0
pkgrel=1
pkgdesc="R is a language and environment for statistical computing and graphics"
arch=('i686' 'x86_64' 'mips64el')
@@ -18,8 +18,8 @@ options=('!makeflags')
source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
'r.desktop'
'r.png')
-sha1sums=('dbdc46edbab2dbbdc115b7247f80da5fee3dd912'
- 'bcc0320d7cc49d56408edc756b50a0f9ba98fe43'
+sha1sums=('878510e8a5fa1ccd1e0c4af5866f5416f3c27469'
+ '13aa29219bcaa102e575de8c1c8e0833d233e836'
'a69a07ec363440efc18ce0a7f2af103375dea978')
build() {
diff --git a/extra/r/r.desktop b/extra/r/r.desktop
index a1b6b1254..68b49c447 100644
--- a/extra/r/r.desktop
+++ b/extra/r/r.desktop
@@ -7,6 +7,5 @@ Icon=/usr/share/pixmaps/r.png
DocPath=/usr/lib/R/doc/html/index.html
StartupNotify=true
Terminal=true
-TerminalOptions=
Type=Application
-Categories=Science;Math
+Categories=Education;Science;Math;