diff -Nru tkrplot-0.0.26/debian/changelog tkrplot-0.0.27/debian/changelog --- tkrplot-0.0.26/debian/changelog 2021-10-06 00:41:19.000000000 +0000 +++ tkrplot-0.0.27/debian/changelog 2022-10-19 14:11:28.000000000 +0000 @@ -1,3 +1,18 @@ +tkrplot (0.0.27-2) unstable; urgency=medium + + * Source-only rebuild and reupload + + -- Dirk Eddelbuettel Wed, 19 Oct 2022 09:11:28 -0500 + +tkrplot (0.0.27-1) unstable; urgency=medium + + * New upstream release + + * debian/control: Set Build-Depends: to current R version + * debian/control: Set Standards-Version: to current version + + -- Dirk Eddelbuettel Tue, 18 Oct 2022 19:03:30 -0500 + tkrplot (0.0.26-1) unstable; urgency=medium * New upstream release diff -Nru tkrplot-0.0.26/debian/control tkrplot-0.0.27/debian/control --- tkrplot-0.0.26/debian/control 2021-10-06 00:41:19.000000000 +0000 +++ tkrplot-0.0.27/debian/control 2022-10-19 00:03:14.000000000 +0000 @@ -2,8 +2,8 @@ Section: gnu-r Priority: optional Maintainer: Dirk Eddelbuettel -Build-Depends: debhelper-compat (= 11), dh-r, r-base-dev (>= 4.1.1), libx11-dev, tcl8.6-dev, tk8.6-dev -Standards-Version: 4.6.0 +Build-Depends: debhelper-compat (= 11), dh-r, r-base-dev (>= 4.2.1), libx11-dev, tcl8.6-dev, tk8.6-dev +Standards-Version: 4.6.1 Vcs-Browser: https://salsa.debian.org/edd/r-cran-tkrplot Vcs-Git: https://salsa.debian.org/edd/r-cran-tkrplot.git Homepage: https://cran.r-project.org/package=tkrplot diff -Nru tkrplot-0.0.26/DESCRIPTION tkrplot-0.0.27/DESCRIPTION --- tkrplot-0.0.26/DESCRIPTION 2021-10-05 16:40:02.000000000 +0000 +++ tkrplot-0.0.27/DESCRIPTION 2022-10-18 23:40:01.000000000 +0000 @@ -1,5 +1,5 @@ Package: tkrplot -Version: 0.0-26 +Version: 0.0-27 Author: Luke Tierney Description: Simple mechanism for placing R graphics in a Tk widget. Title: TK Rplot @@ -8,6 +8,6 @@ Maintainer: Luke Tierney SystemRequirements: Windows or X11 NeedsCompilation: yes -Packaged: 2021-10-05 14:48:00 UTC; luke +Packaged: 2022-10-18 19:37:25 UTC; luke Repository: CRAN -Date/Publication: 2021-10-05 16:40:02 UTC +Date/Publication: 2022-10-18 23:40:01 UTC diff -Nru tkrplot-0.0.26/MD5 tkrplot-0.0.27/MD5 --- tkrplot-0.0.26/MD5 2021-10-05 16:40:02.000000000 +0000 +++ tkrplot-0.0.27/MD5 2022-10-18 23:40:01.000000000 +0000 @@ -1,4 +1,4 @@ -c0c8c5065b8523aa2de67443f17574bb *DESCRIPTION +9624240c9175e6a44185d1963fd85a37 *DESCRIPTION 3aca8b2796f1f9b6214ab2f347cfa1ed *NAMESPACE 4fceef0e7afa31faa84ae6c7affcf290 *R/tkrplot.R 086f7cec932bd63c4da5ccd1298968bf *cleanup @@ -8,4 +8,4 @@ b3d9373beec87b2c2d3e90a2ba46c7f8 *man/TkRplot.Rd b4f97e309b0bab9c0b1f17f8731d0e22 *src/Makevars.in 6b9d020ac2c827c5e35b9f16ff8f13f9 *src/Makevars.win -453ea27081d3bcb121fffbfdfe40141c *src/tcltkimg.c +560ed639ef1d94017bb0dd563533f761 *src/tcltkimg.c diff -Nru tkrplot-0.0.26/src/tcltkimg.c tkrplot-0.0.27/src/tcltkimg.c --- tkrplot-0.0.26/src/tcltkimg.c 2021-02-03 13:29:42.000000000 +0000 +++ tkrplot-0.0.27/src/tcltkimg.c 2022-10-18 19:25:20.000000000 +0000 @@ -190,15 +190,15 @@ *---------------------------------------------------------------------- */ static int -CreateRplot(interp, name, argc, objv, typePtr, master, clientDataPtr) - Tcl_Interp *interp; /* interpreter that will own the image */ - char *name; /* name to use for image */ - int argc; /* number of arguments */ - Tcl_Obj *objv[]; /* argument strings for options as objects - (doesn't include image name or type) */ - Tk_ImageType *typePtr; /* not used */ - Tk_ImageMaster master; /* token for image for use in callbacks */ - ClientData *clientDataPtr; /* store pointer to master data data here */ +CreateRplot(Tcl_Interp *interp, /* interpreter that will own the image */ + const char *name, /* name to use for image */ + int argc, /* number of arguments */ + Tcl_Obj *const objv[],/* argument strings for options as objects + (doesn't include image name or type) */ + const Tk_ImageType *typePtr,/* not used */ + Tk_ImageMaster master,/* token for image for use in callbacks */ + ClientData *clientDataPtr) /* store pointer to master data data + here */ { RplotMaster rpm, *prpm; @@ -255,9 +255,8 @@ *---------------------------------------------------------------------- */ static ClientData -GetRplot(tkwin, masterData) - Tk_Window tkwin; /* window for the instance */ - ClientData masterData; /* pointer to master data structure */ +GetRplot(Tk_Window tkwin, /* window for the instance */ + ClientData masterData) /* pointer to master data structure */ { RplotMaster *prpm = (RplotMaster *) masterData; RplotInstance *inst; @@ -296,15 +295,15 @@ *---------------------------------------------------------------------- */ static void -DisplayRplot(clientData, display, drawable, imageX, imageY, width, - height, drawableX, drawableY) - ClientData clientData; /* pointer to instance data structure */ - Display *display; /* display on which to draw image */ - Drawable drawable; /* pixmap or window in which to draw image. */ - int imageX, imageY; /* upper-left corner of region within image */ - int width, height; /* dimensions of region within image to draw */ - int drawableX, drawableY; /* coordinates in drawable that correspond to - imageX and imageY. */ +DisplayRplot(ClientData clientData, /* pointer to instance data structure */ + Display *display, /* display on which to draw image */ + Drawable drawable, /* pixmap or window in which to draw image. */ + int imageX, /* upper-left corner of region within image */ + int imageY, + int width, /* dimensions of region within image to draw */ + int height, + int drawableX, /* coordinates in drawable that correspond to */ + int drawableY) /* imageX and imageY. */ { RplotInstance *inst = (RplotInstance *) clientData; RplotMaster *prpm = inst->master; @@ -362,9 +361,8 @@ *---------------------------------------------------------------------- */ static void -FreeRplot(clientData, display) - ClientData clientData; /* pointer instance data structure */ - Display *display; /* display containing window that used image */ +FreeRplot(ClientData clientData, /* pointer instance data structure */ + Display *display) /* display containing window that used image */ { RplotInstance *inst = (RplotInstance *) clientData; RplotMaster *prpm = inst->master; @@ -391,8 +389,7 @@ *---------------------------------------------------------------------- */ static void -DeleteRplot(masterData) - ClientData masterData; /* pointer to master structure for image */ +DeleteRplot(ClientData masterData) /* pointer to master structure for image */ { RplotMaster *prpm = (RplotMaster *) masterData; @@ -448,8 +445,7 @@ NULL /* nextPtr */ }; -EXPORT(int,Rplot_Init)(interp) - Tcl_Interp *interp; +EXPORT(int,Rplot_Init)(Tcl_Interp *interp) { /* Added to allow CRAN to disable Tk initialization */ #if !defined(Win32) && !defined(HAVE_AQUA) @@ -472,8 +468,7 @@ return Tcl_PkgProvide(interp,"Rplot", RPLOT_PATCH_LEVEL); } -EXPORT(int,Rplot_SafeInit)(interp) - Tcl_Interp *interp; +EXPORT(int,Rplot_SafeInit)(Tcl_Interp *interp) { return Rplot_Init(interp); }