diff -Nru r-cran-rsclient-0.7-2.0/debian/changelog r-cran-rsclient-0.7-3/debian/changelog --- r-cran-rsclient-0.7-2.0/debian/changelog 2015-07-30 18:35:24.000000000 +0000 +++ r-cran-rsclient-0.7-3/debian/changelog 2015-07-30 18:35:25.000000000 +0000 @@ -1,3 +1,12 @@ +r-cran-rsclient (0.7-3-1) unstable; urgency=low + + * New upstream release + + * debian/control: Set Build-Depends: to current R version + * debian/control: Set Standards-Version: to current version + + -- Dirk Eddelbuettel Tue, 28 Jul 2015 13:39:31 -0500 + r-cran-rsclient (0.7-2.0-1) unstable; urgency=low * New upstream release diff -Nru r-cran-rsclient-0.7-2.0/debian/control r-cran-rsclient-0.7-3/debian/control --- r-cran-rsclient-0.7-2.0/debian/control 2015-07-30 18:35:24.000000000 +0000 +++ r-cran-rsclient-0.7-3/debian/control 2015-07-30 18:35:25.000000000 +0000 @@ -2,8 +2,8 @@ Section: gnu-r Priority: optional Maintainer: Dirk Eddelbuettel -Build-Depends: debhelper (>= 7.0.0), r-base-dev (>= 3.0.0), cdbs, libssl-dev -Standards-Version: 3.9.4 +Build-Depends: debhelper (>= 7.0.0), r-base-dev (>= 3.2.1), cdbs, libssl-dev +Standards-Version: 3.9.6 Package: r-cran-rsclient Architecture: any diff -Nru r-cran-rsclient-0.7-2.0/DESCRIPTION r-cran-rsclient-0.7-3/DESCRIPTION --- r-cran-rsclient-0.7-2.0/DESCRIPTION 2013-08-02 17:19:25.000000000 +0000 +++ r-cran-rsclient-0.7-3/DESCRIPTION 2015-07-28 06:03:34.000000000 +0000 @@ -1,5 +1,5 @@ Package: RSclient -Version: 0.7-2 +Version: 0.7-3 Title: Client for Rserve Author: Simon Urbanek Maintainer: Simon Urbanek @@ -7,7 +7,7 @@ Description: Client for Rserve, allowing to connect to Rserve instances and issue commands. License: GPL-2 | file LICENSE URL: http://www.rforge.net/RSclient/ -Packaged: 2013-08-02 15:23:44 UTC; svnuser NeedsCompilation: yes +Packaged: 2015-07-27 21:09:21 UTC; svnuser Repository: CRAN -Date/Publication: 2013-08-02 19:19:25 +Date/Publication: 2015-07-28 08:03:34 diff -Nru r-cran-rsclient-0.7-2.0/MD5 r-cran-rsclient-0.7-3/MD5 --- r-cran-rsclient-0.7-2.0/MD5 2013-08-02 17:19:25.000000000 +0000 +++ r-cran-rsclient-0.7-3/MD5 2015-07-28 06:03:34.000000000 +0000 @@ -1,7 +1,7 @@ -8eb5a7ac184c05fa0c84df5690a62471 *DESCRIPTION +014b833356de3c60d8f357715fd238f0 *DESCRIPTION 09d68d6181bd117fc2e6e78962515b4d *LICENSE -254fec9664aae8681734cb89c6575dbc *NAMESPACE -7454e4b62b905f47981536387a23272a *NEWS +bd47adfd616c78f6dfaa8aa3e07fded9 *NAMESPACE +e8a981d5d43b243ce9e0268886ce78dd *NEWS 8d815e17f8852a8cdf5b2c5aba41b22e *R/cli.R 850e51c443e01c2c378065d9c8239667 *R/conn.R a0d9bc9f205fc694b10f962a55384a55 *configure.win @@ -11,7 +11,7 @@ ed7bc6eaee8b2524182dcf1647da8a8e *src/Makevars 31e24ed30aca5770049f49f2826f40ef *src/Makevars.win 3eb8be8db486565d2b0ab71ff14e7dc3 *src/RSprotocol.h -6dd729bd8a2512bb62dbcb7b98bc3cb4 *src/cli.c +2d6e4386f079183bfecf68c9bf892d75 *src/cli.c 18fe04a990f3a92ec9278686af92f459 *src/qap.h ed50225ffc871ea75203c241e3f7b32f *src/qap_decode.c ff4d7238f0a17ac5f1ae8f069dd58388 *src/qap_decode.h diff -Nru r-cran-rsclient-0.7-2.0/NAMESPACE r-cran-rsclient-0.7-3/NAMESPACE --- r-cran-rsclient-0.7-2.0/NAMESPACE 2013-08-02 15:23:43.000000000 +0000 +++ r-cran-rsclient-0.7-3/NAMESPACE 2015-07-27 21:09:16.000000000 +0000 @@ -4,4 +4,6 @@ # new client export(RS.connect, RS.eval, RS.eval.qap, RS.close, RS.switch, RS.authkey, RS.login, RS.collect, RS.assign, RS.oobCallbacks) export(RS.server.eval, RS.server.source, RS.server.shutdown) -export(print.RserveConnection, "!=.RserveConnection", "==.RserveConnection") +S3method(print, RserveConnection) +S3method("!=", RserveConnection) +S3method("==", RserveConnection) diff -Nru r-cran-rsclient-0.7-2.0/NEWS r-cran-rsclient-0.7-3/NEWS --- r-cran-rsclient-0.7-2.0/NEWS 2013-08-02 15:23:43.000000000 +0000 +++ r-cran-rsclient-0.7-3/NEWS 2015-07-27 21:09:16.000000000 +0000 @@ -1,3 +1,9 @@ +0.7-3 2015-07-27 + o fix an error when handling OOB if no handlers are registered + + o RS.oobCallbacks(c) would always return NULL callabcks + + 0.7-2 2013-07-02 o add RS.eval(..., lazy=FALSE) which evaluates the argument locally and then remotely. This allows the construction of diff -Nru r-cran-rsclient-0.7-2.0/src/cli.c r-cran-rsclient-0.7-3/src/cli.c --- r-cran-rsclient-0.7-2.0/src/cli.c 2013-08-02 15:23:44.000000000 +0000 +++ r-cran-rsclient-0.7-3/src/cli.c 2015-07-27 21:09:21.000000000 +0000 @@ -716,11 +716,13 @@ /* FIXME: Rserve has a bug(?) that sets CMD_RESP on OOB commands so we clear it for now ... */ hdr->cmd &= ~CMD_RESP; - if (IS_OOB_SEND(hdr->cmd) && c->oob_send_cb) + if (IS_OOB_SEND(hdr->cmd) && c->oob_send_cb != R_NilValue) PROTECT(ee = lang3(c->oob_send_cb, ScalarInteger(OOB_USR_CODE(hdr->cmd)), res)); - if (IS_OOB_MSG(hdr->cmd) && c->oob_msg_cb) + if (IS_OOB_MSG(hdr->cmd) && c->oob_msg_cb != R_NilValue) PROTECT(ee = lang3(c->oob_msg_cb, ScalarInteger(OOB_USR_CODE(hdr->cmd)), res)); +#ifdef RC_DEBUG Rprintf(" - OOB %x %s (%d) %d\n", hdr->cmd, IS_OOB_SEND(hdr->cmd) ? "send" : "other", OOB_USR_CODE(hdr->cmd), (int) tl); +#endif if (ee != R_NilValue) { res = eval(ee, R_GlobalEnv); if (IS_OOB_MSG(hdr->cmd)) { @@ -1186,8 +1188,8 @@ } } PROTECT(res = Rf_mkNamed(VECSXP, (const char *[]) { "send", "msg", "" })); - SET_VECTOR_ELT(res, 0, send_cb); - SET_VECTOR_ELT(res, 1, msg_cb); + SET_VECTOR_ELT(res, 0, c->oob_send_cb); + SET_VECTOR_ELT(res, 1, c->oob_msg_cb); UNPROTECT(1); return res; }