new R package naming

2 files changed, 11 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f10f2a82f4e5..3f9cc42e644b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = r-cran-gdtools
+pkgbase = r-gdtools
 	pkgdesc = Useful tools for writing vector graphics devices
 	pkgver = 0.1.7
 	pkgrel = 1
@@ -7,9 +7,12 @@ pkgbase = r-cran-gdtools
 	arch = x86_64
 	license = GPL3
 	depends = r>=3.0.0
-	depends = r-cran-withr
+	depends = r-withr
+	provides = r-cran-gdtools=0.1.7
+	conflicts = r-cran-gdtools
+	replaces = r-cran-gdtools
 	source = http://cran.r-project.org/src/contrib/gdtools_0.1.7.tar.gz
 	md5sums = ffad0248bf8b676ca7721239076492f0
 
-pkgname = r-cran-gdtools
+pkgname = r-gdtools
 
diff --git a/PKGBUILD b/PKGBUILD
index e8a57f858dd3..36101a470909 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,17 @@
 
 _cranname=gdtools
 _cranver=0.1.7
-pkgname=r-cran-gdtools
+pkgname=r-${_cranname}
 pkgver=${_cranver}
 pkgrel=1
 pkgdesc="Useful tools for writing vector graphics devices"
 url="http://cran.r-project.org/web/packages/${_cranname}/index.html"
 arch=('i686' 'x86_64')
 license=('GPL3')
-depends=('r>=3.0.0' 'r-cran-withr')
+depends=('r>=3.0.0' 'r-withr')
+provides=("r-cran-${_cranname}=0.1.7")
+conflicts=("r-cran-${_cranname}")
+replaces=("r-cran-${_cranname}")
 source=("http://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
 md5sums=('ffad0248bf8b676ca7721239076492f0')