Revision: 765
http://rpy.svn.sourceforge.net/rpy/?rev=765&view=rev
Author: eddelbuettel
Date: 2009-10-16 21:31:44 +0000 (Fri, 16 Oct 2009)
Log Message:
-----------
Debian changes for building rpy under R 2.10.0 including a small change to
rpy_tools.py to copy with the 'double digit' minor number
Modified Paths:
--------------
trunk/rpy/debian/changelog
trunk/rpy/debian/control
trunk/rpy/debian/python-rpy.lintian-overrides
trunk/rpy/rpy_tools.py
Modified: trunk/rpy/debian/changelog
===================================================================
--- trunk/rpy/debian/changelog 2009-09-25 05:31:50 UTC (rev 764)
+++ trunk/rpy/debian/changelog 2009-10-16 21:31:44 UTC (rev 765)
@@ -1,3 +1,11 @@
+rpy (1.0.3-12) unstable; urgency=low
+
+ * Rebuilt under R 2.10.0 beta (Closes:
#551232)
+
+ * debian/control: Upgraded (Build-)Depends: to current R version
+
+ -- Dirk Eddelbuettel <e...@debian.org> Fri, 16 Oct 2009 12:53:16 -0500
+
rpy (1.0.3-11) unstable; urgency=low
* rpy.py: Set __version__ to rpy_version as suggested by Yaroslav Halchenko
Modified: trunk/rpy/debian/control
===================================================================
--- trunk/rpy/debian/control 2009-09-25 05:31:50 UTC (rev 764)
+++ trunk/rpy/debian/control 2009-10-16 21:31:44 UTC (rev 765)
@@ -4,11 +4,11 @@
Maintainer: Dirk Eddelbuettel <e...@debian.org>
Standards-Version: 3.8.3
XS-Python-Version: all
-Build-Depends: debhelper (>= 7.2.17), r-base-dev (>= 2.9.2), python-all-dev
(>= 2.3.5-10), python-numpy (>= 1:1.3.0), texinfo, texi2html, texlive-base,
texlive-latex-base, python-central (>= 0.5)
+Build-Depends: debhelper (>= 7.2.17), r-base-dev (>= 2.10.0~20091013),
python-all-dev (>= 2.3.5-10), python-numpy (>= 1:1.3.0), texinfo, texi2html,
texlive-base, texlive-latex-base, python-central (>= 0.5)
Package: python-rpy
Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-numpy (>= 1:1.3.0),
r-base-core (>= 2.9.2)
+Depends: ${shlibs:Depends}, ${python:Depends}, python-numpy (>= 1:1.3.0),
r-base-core (>= 2.10.0~20091013)
Replaces: python2.2-rpy (<< 0.99.2-4), python2.3-rpy (<< 0.99.2-4),
python2.4-rpy (<< 0.99.2-4)
Conflicts: python2.2-rpy (<< 0.99.2-4), python2.3-rpy (<< 0.99.2-4),
python2.4-rpy (<< 0.99.2-4)
XB-Python-Version: ${python:Versions}
Modified: trunk/rpy/debian/python-rpy.lintian-overrides
===================================================================
--- trunk/rpy/debian/python-rpy.lintian-overrides 2009-09-25 05:31:50 UTC
(rev 764)
+++ trunk/rpy/debian/python-rpy.lintian-overrides 2009-10-16 21:31:44 UTC
(rev 765)
@@ -1,6 +1,6 @@
python-rpy: script-not-executable
./usr/share/pycentral/python-rpy/site-packages/rpy_options.py
python-rpy: script-not-executable ./usr/share/pyshared/rpy_options.py
-python-rpy: binary-or-shlib-defines-rpath
./usr/lib/python2.4/site-packages/_rpy2092.so /usr/lib/R/bin
-python-rpy: binary-or-shlib-defines-rpath
./usr/lib/python2.4/site-packages/_rpy2092.so /usr/lib/R/lib
-python-rpy: binary-or-shlib-defines-rpath
./usr/lib/python2.5/site-packages/_rpy2092.so /usr/lib/R/bin
-python-rpy: binary-or-shlib-defines-rpath
./usr/lib/python2.5/site-packages/_rpy2092.so /usr/lib/R/lib
+python-rpy: binary-or-shlib-defines-rpath
./usr/lib/python2.4/site-packages/_rpy2100.so /usr/lib/R/bin
+python-rpy: binary-or-shlib-defines-rpath
./usr/lib/python2.4/site-packages/_rpy2100.so /usr/lib/R/lib
+python-rpy: binary-or-shlib-defines-rpath
./usr/lib/python2.5/site-packages/_rpy2100.so /usr/lib/R/bin
+python-rpy: binary-or-shlib-defines-rpath
./usr/lib/python2.5/site-packages/_rpy2100.so /usr/lib/R/lib
Modified: trunk/rpy/rpy_tools.py
===================================================================
--- trunk/rpy/rpy_tools.py 2009-09-25 05:31:50 UTC (rev 764)
+++ trunk/rpy/rpy_tools.py 2009-10-16 21:31:44 UTC (rev 765)
@@ -98,7 +98,8 @@
raise RuntimeError("Couldn't execute the R interpreter" +
" `%s'.\n" % rexec )
# edd 05 Apr 2006 version = re.search("R +([0-9]\.[0-9]\.[0-9])", output)
- version = re.search(" +([0-9]\.[0-9]\.[0-9])", output)
+ # edd 16 Oct 2009 version = re.search("R +([0-9]\.[0-9]+\.[0-9])", output)
+ version = re.search(" +([0-9]\.[0-9]+\.[0-9])", output)
if not version:
raise RuntimeError("Couldn't obtain version number from output\n"
"of `R --version'.\n")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
rpy-list mailing list
rpy-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpy-list
