diff -Nru rodbc-1.3-21/ChangeLog rodbc-1.3-22/ChangeLog --- rodbc-1.3-21/ChangeLog 2023-08-19 04:41:16.000000000 +0000 +++ rodbc-1.3-22/ChangeLog 2023-11-21 17:12:40.000000000 +0000 @@ -1,4 +1,8 @@ -Version: 1.3-29 (2023-08-19, released) +Version: 1.3-22 (2023-11-21, released) + + * src/RODBC.c: tweaks, including use of Rprintf. + +Version: 1.3-21 (2023-08-19, released) * man/RODBC-package.Rd: add extra alias at KH's insistence. diff -Nru rodbc-1.3-21/DESCRIPTION rodbc-1.3-22/DESCRIPTION --- rodbc-1.3-21/DESCRIPTION 2023-08-19 07:51:06.000000000 +0000 +++ rodbc-1.3-22/DESCRIPTION 2023-11-21 20:46:14.000000000 +0000 @@ -1,6 +1,6 @@ Package: RODBC -Version: 1.3-21 -Revision: $Rev: 3631 $ +Version: 1.3-22 +Revision: $Rev: 3633 $ Date: 2023-09-19 Authors@R: c(person("Brian", "Ripley", role = c("aut", "cre"), email = "ripley@stats.ox.ac.uk"), @@ -15,9 +15,9 @@ Biarch: yes License: GPL-2 | GPL-3 NeedsCompilation: yes -Packaged: 2023-08-19 07:49:50 UTC; ripley +Packaged: 2023-11-21 20:45:25 UTC; ripley Author: Brian Ripley [aut, cre], Michael Lapsley [aut] (1999 to Oct 2002) Maintainer: Brian Ripley Repository: CRAN -Date/Publication: 2023-08-19 09:50:39 +Date/Publication: 2023-11-21 21:45:46 diff -Nru rodbc-1.3-21/MD5 rodbc-1.3-22/MD5 --- rodbc-1.3-21/MD5 2023-08-19 07:51:06.000000000 +0000 +++ rodbc-1.3-22/MD5 2023-11-21 20:46:14.000000000 +0000 @@ -1,5 +1,5 @@ -08cbc7001b1acac9196ef12faf037155 *ChangeLog -c01aaddaa07d8f73627732b0e90e562c *DESCRIPTION +2133c408fe7cbe831efd5542e3976157 *ChangeLog +5cab4b3130cf91d8e1f071380e689773 *DESCRIPTION eb723b61539feef013de476e68b5c50a *GPL-2 e939f0b310630eb16cabc697aecaed25 *LICENCE.note f946374da2e4588d5056921f41ee4608 *NAMESPACE @@ -7,13 +7,13 @@ 33dd6a1f0b2e81f0869119d009c49181 *R/TypeInfo.R 005ae27b5c2c9de82ca464b7c18cf431 *R/sql.R 0869f5c6e4029a8cd8ff94ef765f3ef9 *R/win.R -8e5bb0a8518888a60eb3030be227ed20 *build/vignette.rds +e786e8ea70aa2d780a323ff4f9698e79 *build/vignette.rds 2ee6281df3a48ebf8e9b5943efc6bce6 *cleanup 0c1487506d5c380c923f325ee78b0b6b *configure 2b71a4726dd54885a2144b1ca1c7a25a *configure.ac bb8c1972ee5f14b8c3c55d0dac674591 *configure.win a86f0da6d5fad59d12749b906a66f87a *inst/doc/RODBC.Rnw -5445f7de3ac587b907688be50861984a *inst/doc/RODBC.pdf +5d4a9c576392b0f2ed72627b3d924d2b *inst/doc/RODBC.pdf 7cd664dd5e18f48d6252ed2f46ea92cb *inst/po/da/LC_MESSAGES/R-RODBC.mo 9d525d1d29df21fb72779eb91b7cab77 *inst/po/da/LC_MESSAGES/RODBC.mo 6d7a3069cb23af5bc28a24c87562bb76 *inst/po/de/LC_MESSAGES/R-RODBC.mo @@ -54,7 +54,7 @@ 463c8703fcfd296b2d5563476e01a308 *po/pl.po 0fe1b90d2b7adf1d85e5b38f643d4bbd *src/Makevars.in ad4d2913f37fe87f14158155f7f8284a *src/Makevars.win -d33fe11d191d21ccbb2ecee6f7b2b899 *src/RODBC.c +ca28824995b5eb9730feea60334ba6ff *src/RODBC.c 89e3f0ba613dcfe828f658315c669357 *src/config.h.in 7cf764264d239d149e9b0dd1e366f16a *src/config.h.win 5c11ed447e9f9393862363359a9fd906 *tests/DB2.RR Binary files /tmp/tmpjg02kuap/nIfZPsc7kW/rodbc-1.3-21/build/vignette.rds and /tmp/tmpjg02kuap/HxhdnBt5QS/rodbc-1.3-22/build/vignette.rds differ diff -Nru rodbc-1.3-21/debian/changelog rodbc-1.3-22/debian/changelog --- rodbc-1.3-21/debian/changelog 2023-10-05 00:24:09.000000000 +0000 +++ rodbc-1.3-22/debian/changelog 2023-11-25 14:55:48.000000000 +0000 @@ -1,51 +1,422 @@ -rodbc (1.3-21-1cran1.1804.0) bionic; urgency=medium +rodbc (1.3-22-1.1804.0) bionic; urgency=medium * Compilation for Ubuntu 18.04.6 LTS * Remove dependency for R 4.0.0 for backports in Ubuntu * debian/control, debian/rules, debian/compat: revert to a version of debheler < 10 - -- Michael Rutter Thu, 05 Oct 2023 00:24:09 +0000 + -- Michael Rutter Sat, 25 Nov 2023 14:55:48 +0000 -rodbc (1.3-21-1cran1) testing; urgency=low +rodbc (1.3-22-1) unstable; urgency=medium - * cran2deb svn: 362M with DB version 1. + * New upstream release - -- cran2deb4ubuntu Sun, 27 Aug 2023 03:45:07 -0400 + * debian/control: Set (Build-)Depends: to current R version + -- Dirk Eddelbuettel Tue, 21 Nov 2023 15:43:14 -0600 -rodbc (1.3-20-1cran1) testing; urgency=low +rodbc (1.3-21-1) unstable; urgency=medium - * cran2deb svn: 362M with DB version 1. + * New upstream release - -- cran2deb4ubuntu Sun, 11 Dec 2022 11:38:18 -0500 + * debian/control: Set (Build-)Depends: to current R version + * debian/control: Set Standards-Version: to current version + * debian/control: Switch to virtual debhelper-compat (= 13) + -- Dirk Eddelbuettel Thu, 24 Aug 2023 11:26:51 -0500 -rodbc (1.3-19-1cran1) testing; urgency=low +rodbc (1.3-20-1) unstable; urgency=medium - * cran2deb svn: 362M with DB version 1. + * New upstream release - -- cran2deb4ubuntu Sat, 18 Sep 2021 09:50:56 -0400 + * debian/control: Set (Build-)Depends: to current R version + * debian/control: Set Standards-Version: to current version + * debian/control: Switch to virtual debhelper-compat (= 12) + -- Dirk Eddelbuettel Tue, 06 Dec 2022 06:55:48 -0600 -rodbc (1.3-18-1cran1) testing; urgency=low +rodbc (1.3-19-1) unstable; urgency=medium - * cran2deb svn: 362M with DB version 1. + * New upstream release - -- cran2deb4ubuntu Sun, 05 Sep 2021 10:25:30 -0400 + -- Dirk Eddelbuettel Thu, 16 Sep 2021 14:10:07 -0500 +rodbc (1.3-18-1) unstable; urgency=medium -rodbc (1.3-17-1cran1) testing; urgency=low + * New upstream release - * cran2deb svn: 362M with DB version 1. + * debian/control: Set Build-Depends: to current R version + * debian/control: Set Standards-Version: to current version - -- cran2deb4ubuntu Sat, 02 Jan 2021 09:21:11 -0500 + -- Dirk Eddelbuettel Mon, 30 Aug 2021 12:24:02 -0500 +rodbc (1.3-17-1) unstable; urgency=medium -rodbc (1.3-16-1cran1) testing; urgency=low + * New upstream release - * cran2deb svn: 362M with DB version 1. + * debian/control: Set Build-Depends: to current R version + * debian/control: Set Standards-Version: to current version - -- cran2deb4ubuntu Sat, 12 Sep 2020 09:52:54 -0400 + -- Dirk Eddelbuettel Mon, 11 May 2020 09:36:33 -0500 + +rodbc (1.3-16-1) unstable; urgency=medium + + * New upstream release + + * debian/control: Set Build-Depends: to current R version + * debian/control: Set Standards-Version: to current version + * debian/control: Add Vcs-Browser: and Vcs-Git: + * debian/compat: Increase level to 9 + * debian/control: Switch from cdbs to dh-r + * debian/rules: Idem + + -- Dirk Eddelbuettel Tue, 03 Sep 2019 10:37:02 -0500 + +rodbc (1.3-15-1) unstable; urgency=medium + + * New upstream release + + * debian/control: Set Build-Depends: to current R version + + * debian/control: Added ${misc:Depends} to Depends: + + -- Dirk Eddelbuettel Thu, 13 Apr 2017 07:23:44 -0500 + +rodbc (1.3-14-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, 04 Oct 2016 18:59:04 -0500 + +rodbc (1.3-13-2) unstable; urgency=medium + + * debian/compat: Created (Closes: #827656) + + * debian/control: Set Build-Depends: to current R version + * debian/control: Set Standards-Version: to current version + + -- Dirk Eddelbuettel Sun, 19 Jun 2016 08:17:59 -0500 + +rodbc (1.3-13-1) unstable; urgency=medium + + * New upstream release + + * debian/control: Set Build-Depends: to current R version + + -- Dirk Eddelbuettel Sat, 16 Apr 2016 12:15:12 -0500 + +rodbc (1.3-12-1) unstable; urgency=low + + * New upstream release + + * debian/control: Set Build-Depends: to current R version + + -- Dirk Eddelbuettel Tue, 30 Jun 2015 09:10:18 -0500 + +rodbc (1.3-11-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 Thu, 26 Feb 2015 06:30:59 -0600 + +rodbc (1.3-10-1) unstable; urgency=low + + * New upstream release + + -- Dirk Eddelbuettel Mon, 25 Nov 2013 06:42:11 -0600 + +rodbc (1.3-9-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 Fri, 01 Nov 2013 06:39:15 -0500 + +rodbc (1.3-8-1) unstable; urgency=low + + * New upstream release + + -- Dirk Eddelbuettel Tue, 03 Sep 2013 11:09:05 -0500 + +rodbc (1.3-7-1) unstable; urgency=low + + * New upstream release + + * debian/control: Set Build-Depends: to current R version + + -- Dirk Eddelbuettel Sat, 13 Jul 2013 12:30:26 -0500 + +rodbc (1.3-6-2) unstable; urgency=low + + * debian/control: Set Build-Depends: to current R version + + * (Re-)building with R 3.0.0 (beta) + + -- Dirk Eddelbuettel Sat, 30 Mar 2013 10:03:41 -0500 + +rodbc (1.3-6-1) unstable; urgency=low + + * New upstream release + + -- Dirk Eddelbuettel Wed, 27 Jun 2012 12:30:19 -0500 + +rodbc (1.3-5-1) unstable; urgency=low + + * New upstream release + + * debian/control: Set Build-Depends: to current R version + * debian/control: Change Depends to ${R:Depends} + * debian/control: Set Standards-Version: to current version + + -- Dirk Eddelbuettel Fri, 09 Mar 2012 08:45:56 -0600 + +rodbc (1.3-4-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 Thu, 05 Jan 2012 08:45:59 -0600 + +rodbc (1.3-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, 26 Jul 2011 14:01:25 -0500 + +rodbc (1.3-2-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 Mon, 26 Jul 2010 09:37:22 -0500 + +rodbc (1.3-1-2) unstable; urgency=low + + * Rebuilt for R 2.10.0 to work with new R-internal help file conversion + + * debian/control: Set (Build-)Depends: to current R version + + -- Dirk Eddelbuettel Tue, 03 Nov 2009 14:14:12 -0600 + +rodbc (1.3-1-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 Mon, 12 Oct 2009 16:33:21 -0500 + +rodbc (1.3-0-1) unstable; urgency=low + + * New upstream release + + -- Dirk Eddelbuettel Tue, 28 Jul 2009 10:01:10 -0500 + +rodbc (1.2.6-1) unstable; urgency=low + + * New upstream release + + * debian/control: Changed Section: to new section 'gnu-r' + + * debian/control: Set (Build-)Depends: to current R version + * debian/control: Set Standards-Version: to current version 3.8.2 + + -- Dirk Eddelbuettel Wed, 24 Jun 2009 19:36:55 -0500 + +rodbc (1.2.5-1) unstable; urgency=low + + * New upstream release + + * debian/control: Set (Build-)Depends: to current R version 2.8.1 + + -- Dirk Eddelbuettel Wed, 21 Jan 2009 16:41:57 -0600 + +rodbc (1.2.4-1) unstable; urgency=low + + * New upstream release + + * debian/control: Set (Build-)Depends: to current R version 2.8.0 + * debian/control: Set Standards-Version: to current version 3.8.0 + + -- Dirk Eddelbuettel Wed, 19 Nov 2008 19:54:37 -0600 + +rodbc (1.2.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 3.7.3 + + -- Dirk Eddelbuettel Sun, 27 Jan 2008 10:14:53 -0600 + +rodbc (1.2.2-1) unstable; urgency=low + + * New upstream release + + * Built with R 2.6.0, so setting (Build-)Depends: to + 'r-base-(core|dev) >= 2.6.0' to prevent move to testing before R 2.6.0 + + -- Dirk Eddelbuettel Sat, 20 Oct 2007 20:59:18 -0500 + +rodbc (1.2.1-1) unstable; urgency=low + + * New upstream release + + -- Dirk Eddelbuettel Mon, 04 Jun 2007 20:04:31 -0500 + +rodbc (1.2.0-1) unstable; urgency=low + + * New upstream release + + * debian/control: Updated (Build-)Depensd to r-base-core (>= 2.5.0) + + -- Dirk Eddelbuettel Tue, 24 Apr 2007 22:15:45 -0500 + +rodbc (1.1.9-1) unstable; urgency=low + + * New upstream release + * debian/control: (Build-)Depends: updated to r-base-dev (>> 2.4.1) + + -- Dirk Eddelbuettel Thu, 12 Apr 2007 23:42:40 -0500 + +rodbc (1.1.8-1) unstable; urgency=low + + * New upstream release + * debian/control: Updated (Build-_Depends: to r-base-dev (>= 2.4.1) + + -- Dirk Eddelbuettel Thu, 11 Jan 2007 13:20:26 -0600 + +rodbc (1.1.7-1) unstable; urgency=low + + * New upstream release + + * debian/rules: Simplified to cdbs-based one-liner sourcing r-cran.mk + * debian/control: Hence Build-Depends: updated to r-base-dev (>= 2.3.1) + + * debian/post{inst,rm}: No longer call R to update html index + + * debian/control: Standards-Version: increased to 3.7.2 + + -- Dirk Eddelbuettel Wed, 30 Aug 2006 22:24:43 -0500 + +rodbc (1.1.6-2) unstable; urgency=low + + * Rebuilt with -sa to force upload of the upstream orig.tar.gz + which got missed last time due to an incorrectly named file + + -- Dirk Eddelbuettel Tue, 4 Apr 2006 20:22:22 -0500 + +rodbc (1.1.6-1) unstable; urgency=low + + * New upstream release + + -- Dirk Eddelbuettel Tue, 4 Apr 2006 19:25:18 -0500 + +rodbc (1.1.5-2) unstable; urgency=low + + [ Dirk Eddelbuettel ] + * With thanks to Steve Langasek, this releases fixes an 64-bit bug + on amd64 that was noticed by Johannes Ranke (Closes: #354723) + + [ Steve Langasek ] + * RODBC.c: Fix a handful of SQL types for 64-bit compatibility + * debian/rules: Define -DBUILD_REAL_64_BIT_MODE + + -- Dirk Eddelbuettel Sat, 4 Mar 2006 16:56:05 -0600 + +rodbc (1.1.5-1) unstable; urgency=low + + * New upstream release + * debian/post{inst,rm}: No longer call /usr/bin/R + + -- Dirk Eddelbuettel Tue, 10 Jan 2006 15:01:45 -0600 + +rodbc (1.1.4-1) unstable; urgency=low + + * New upstream release + * debian/post{inst,rm}: Call /usr/bin/R with explicitly (thanks, Kurt Hornik) + * debian/control: Upgraded Standards-Version: to 3.6.2.1 + * debian/watch: Corrected regular expression with (thanks, Rafael Laboissier) + + * configure.ac: Revert back from AC_INIT([RODBC]) to AC_INIT(DESCRIPTION) + as building inside the source failed with this new change, report upstream + + -- Dirk Eddelbuettel Fri, 5 Aug 2005 20:27:49 -0500 + +rodbc (1.1.3-1) unstable; urgency=low + + * New upstream release + + -- Dirk Eddelbuettel Mon, 7 Feb 2005 20:55:59 -0600 + +rodbc (1.1.2-1) unstable; urgency=low + + * New upstream release + + -- Dirk Eddelbuettel Wed, 27 Oct 2004 20:58:49 -0500 + +rodbc (1.1.1-2) unstable; urgency=low + + * Rebuilt under R 2.0.0 + * debian/control: Updated Build-Depends: and Depends: accordingly + * debian/watch: Added watch file + + -- Dirk Eddelbuettel Thu, 7 Oct 2004 22:48:10 -0500 + +rodbc (1.1.1-1) unstable; urgency=low + + * New upstream release + * debian/control: Expanded Description text (Closes: #209923) + * debian/control: Increased Standards-Version to 3.6.1.1 + * debian/control: Increased Build-Depends to current R version + * debian/post{inst,rm}: Call build-help.pl to update package.html list + + -- Dirk Eddelbuettel Wed, 15 Sep 2004 20:57:52 -0500 + +rodbc (1.0.4-1) unstable; urgency=low + + * New upstream release + * debian/rules: Rewritten using (invariant) cdbs template + * debian/control: Increased Standards-Version to 3.6.0 + * debian/control: Added cdbs to Build-Depends + + -- Dirk Eddelbuettel Mon, 28 Jul 2003 21:01:04 -0500 + +rodbc (1.0.3-1) unstable; urgency=low + + * New upstream release + * debian/control: Build-Depends simplified in line with R 1.7.1 + * debian/control: Increased Standards-Version to 3.5.10 + + -- Dirk Eddelbuettel Thu, 19 Jun 2003 21:16:01 -0500 + +rodbc (1.0.2-1) unstable; urgency=low + + * New upstream release + * debian/rules: Install into $R_HOME/site-library + + -- Dirk Eddelbuettel Thu, 15 May 2003 21:51:13 -0500 + +rodbc (1.0.1-1) unstable; urgency=low + + * Initial Debian Release + + -- Dirk Eddelbuettel Sun, 2 Mar 2003 09:02:03 -0600 diff -Nru rodbc-1.3-21/debian/compat rodbc-1.3-22/debian/compat --- rodbc-1.3-21/debian/compat 2023-08-27 07:45:07.000000000 +0000 +++ rodbc-1.3-22/debian/compat 2023-11-25 14:55:48.000000000 +0000 @@ -1 +1 @@ -9 \ No newline at end of file +10 diff -Nru rodbc-1.3-21/debian/control rodbc-1.3-22/debian/control --- rodbc-1.3-21/debian/control 2023-10-05 00:24:09.000000000 +0000 +++ rodbc-1.3-22/debian/control 2023-11-25 14:55:48.000000000 +0000 @@ -1,19 +1,27 @@ Source: rodbc Section: gnu-r Priority: optional -Maintainer: cran2deb4ubuntu -Build-Depends: unixodbc-dev, r-base-dev, xvfb, xauth, xfonts-base, - r-base-core, debhelper (>> 4.1.0), cdbs -Standards-Version: 4.1.4 +Maintainer: Dirk Eddelbuettel +Build-Depends: debhelper, dh-r, r-base-dev, dh-r, unixodbc-dev +Standards-Version: 4.6.2 +Vcs-Browser: https://salsa.debian.org/edd/r-cran-rodbc +Vcs-Git: https://salsa.debian.org/edd/r-cran-rodbc.git +Homepage: https://cran.r-project.org/package=RODBC Package: r-cran-rodbc Architecture: any -Depends: r-base-core, ${shlibs:Depends} -Description: GNU R package "ODBC Database Access" +Depends: ${shlibs:Depends}, ${misc:Depends}, ${R:Depends} +Suggests: odbc-postgresql, libmyodbc +Description: GNU R package for ODBC database access + This CRAN package provides access to any Open DataBase Connectivity (ODBC) + accessible database. . - An ODBC database interface. + The package should be platform independent and provide access to any + database for which a driver exists. It has been tested with MySQL + and PostgreSQL on both Linux and Windows (and to those DBMSs on Linux + hosts from R under Windows), Microsoft Access, SQL Server and Excel + spreadsheets (read-only), and users have reported success with + connections to Oracle and DBase. . - Author: Brian Ripley [aut, cre], Michael Lapsley [aut] (1999 to Oct - 2002) - . - Maintainer: Brian Ripley + Usage is covered in the R Data Import/Export manual (available via the + r-doc-pdf, r-doc-html and r-doc-info packages). diff -Nru rodbc-1.3-21/debian/copyright rodbc-1.3-22/debian/copyright --- rodbc-1.3-21/debian/copyright 2023-08-27 07:45:07.000000000 +0000 +++ rodbc-1.3-22/debian/copyright 2019-09-03 15:26:22.000000000 +0000 @@ -1,18 +1,32 @@ -This Debian package of the GNU R package RODBC was generated -automatically using cran2deb4ubuntu by cran2deb4ubuntu -. +This is the Debian GNU/Linux r-cran-rodbc package of rodbc, an ODBC +database access package for GNU R. RODBC was originally written by +Michael Lapsley and is now maintained +by B. D. Ripley . -The original GNU R package is Copyright (C) 2023 Brian Ripley [aut, -cre], Michael Lapsley [aut] (1999 to Oct 2002) and possibly others. +This package was created by Dirk Eddelbuettel . +The sources were downloaded from + http://cran.us.r-project.org/src/contrib/ -The original GNU R package is maintained by Brian Ripley - and was obtained from: +The package was renamed from its upstream name 'RODBC' to 'r-cran-rodbc' +to highlight the fact that is it a CRAN package for R, and to match +Debian's convention of lowercase package names. -http://cran.r-project.org/src/contrib +Copyright (C) 1997 - 2008 Michael Lapsley and Brian D. Ripley -The GNU R package DESCRIPTION offers a Copyright licenses under the -terms of the license: GPL-2 . On a Debian GNU/Linux system, common -licenses are included in the directory /usr/share/common-licenses/. +License: GPL-2 -The DESCRIPTION file for the original GNU R package can be found in -/usr/lib/R/site-library/r-cran-rodbc/DESCRIPTION +On a Debian GNU/Linux system, the GPL (v2) license is included in the +file /usr/share/common-licenses/GPL-2. + +For reference, the upstream DESCRIPTION file is included below: + + Package: RODBC + Version: 1.0-1 + Date: 2003-01-20 + Author: Originally Michael Lapsley , + later B. D. Ripley + Maintainer: B. D. Ripley + Title: ODBC database access + Description: An ODBC database interface + Depends: R (>= 1.6.0) + License: GPL2 diff -Nru rodbc-1.3-21/debian/overrides rodbc-1.3-22/debian/overrides --- rodbc-1.3-21/debian/overrides 1970-01-01 00:00:00.000000000 +0000 +++ rodbc-1.3-22/debian/overrides 2019-09-03 15:26:22.000000000 +0000 @@ -0,0 +1,2 @@ +r-cran-rodbc: extra-license-file usr/lib/R/site-library/RODBC/COPYING +r-cran-rodbc: extra-license-file usr/lib/R/site-library/RODBC/LICENCE diff -Nru rodbc-1.3-21/debian/patch_20060304_steve.patch rodbc-1.3-22/debian/patch_20060304_steve.patch --- rodbc-1.3-21/debian/patch_20060304_steve.patch 1970-01-01 00:00:00.000000000 +0000 +++ rodbc-1.3-22/debian/patch_20060304_steve.patch 2019-09-03 15:26:17.000000000 +0000 @@ -0,0 +1,57 @@ +diff -Nru /tmp/KeP9uZ3ItY/rodbc-1.1.5/debian/changelog /tmp/W7l6P0uH3P/rodbc-1.1.5/debian/changelog +--- /tmp/KeP9uZ3ItY/rodbc-1.1.5/debian/changelog 2006-03-04 12:45:05.000000000 -0800 ++++ /tmp/W7l6P0uH3P/rodbc-1.1.5/debian/changelog 2006-03-04 12:45:07.000000000 -0800 +@@ -1,3 +1,10 @@ ++rodbc (1.1.5-1.1) unstable; urgency=low ++ ++ * Non-maintainer upload. ++ * Fix a handful of SQL types for 64-bit compatibility ++ ++ -- Steve Langasek Sat, 4 Mar 2006 02:09:39 -0800 ++ + rodbc (1.1.5-1) unstable; urgency=low + + * New upstream release +diff -Nru /tmp/KeP9uZ3ItY/rodbc-1.1.5/debian/rules /tmp/W7l6P0uH3P/rodbc-1.1.5/debian/rules +--- /tmp/KeP9uZ3ItY/rodbc-1.1.5/debian/rules 2006-03-04 12:45:05.000000000 -0800 ++++ /tmp/W7l6P0uH3P/rodbc-1.1.5/debian/rules 2006-03-04 12:45:07.000000000 -0800 +@@ -6,6 +6,9 @@ + include /usr/share/cdbs/1/rules/debhelper.mk + include /usr/share/cdbs/1/class/langcore.mk + ++CPPFLAGS := -DBUILD_REAL_64_BIT_MODE ++export CPPFLAGS ++ + ## We need the CRAN (upstream) name + cranName := $(shell grep Package: DESCRIPTION | cut -f2 -d" ") + ## and we need to build a Debian Policy-conformant lower-case package name +diff -Nru /tmp/KeP9uZ3ItY/rodbc-1.1.5/src/RODBC.c /tmp/W7l6P0uH3P/rodbc-1.1.5/src/RODBC.c +--- /tmp/KeP9uZ3ItY/rodbc-1.1.5/src/RODBC.c 2005-08-05 23:32:57.000000000 -0700 ++++ /tmp/W7l6P0uH3P/rodbc-1.1.5/src/RODBC.c 2006-03-04 12:45:07.000000000 -0800 +@@ -53,7 +53,7 @@ + SQLCHAR ColName[256]; + SQLSMALLINT NameLength; + SQLSMALLINT DataType; +- SQLUINTEGER ColSize; ++ SQLULEN ColSize; + SQLSMALLINT DecimalDigits; + SQLSMALLINT Nullable; + char *pData; +@@ -61,7 +61,7 @@ + SQLREAL R4Data; + SQLINTEGER IData; + SQLSMALLINT I2Data; +- SQLINTEGER IndPtr; ++ SQLLEN IndPtr; + } COLUMNS; + + typedef struct mess { +@@ -74,7 +74,7 @@ + SQLHDBC hDbc; + SQLHSTMT hStmt; + int fStmt; +- SQLINTEGER nRows; ++ SQLLEN nRows; + SQLSMALLINT nColumns; + int channel; + int id; diff -Nru rodbc-1.3-21/debian/rules rodbc-1.3-22/debian/rules --- rodbc-1.3-21/debian/rules 2023-08-27 07:45:07.000000000 +0000 +++ rodbc-1.3-22/debian/rules 2019-09-03 15:30:38.000000000 +0000 @@ -1,3 +1,11 @@ #!/usr/bin/make -f -debRreposname := cran -include /usr/share/R/debian/r-cran.mk +# -*- makefile -*- +# debian/rules file for the Debian/GNU Linux r-cran-rodbc package +# Copyright 2003 - 2019 by Dirk Eddelbuettel + +## this was introduced to fix Debian bug report #354723 +CPPFLAGS := -DBUILD_REAL_64_BIT_MODE +export CPPFLAGS + +%: + dh $@ --buildsystem R diff -Nru rodbc-1.3-21/debian/source/format rodbc-1.3-22/debian/source/format --- rodbc-1.3-21/debian/source/format 2023-08-27 07:45:07.000000000 +0000 +++ rodbc-1.3-22/debian/source/format 2013-09-06 11:05:46.000000000 +0000 @@ -1 +1 @@ -3.0 (quilt) \ No newline at end of file +3.0 (quilt) diff -Nru rodbc-1.3-21/debian/watch rodbc-1.3-22/debian/watch --- rodbc-1.3-21/debian/watch 1970-01-01 00:00:00.000000000 +0000 +++ rodbc-1.3-22/debian/watch 2019-09-03 15:26:26.000000000 +0000 @@ -0,0 +1,2 @@ +version=3 +http://cran.r-project.org/src/contrib/RODBC_(.*)\.tar.gz Binary files /tmp/tmpjg02kuap/nIfZPsc7kW/rodbc-1.3-21/inst/doc/RODBC.pdf and /tmp/tmpjg02kuap/HxhdnBt5QS/rodbc-1.3-22/inst/doc/RODBC.pdf differ diff -Nru rodbc-1.3-21/src/RODBC.c rodbc-1.3-22/src/RODBC.c --- rodbc-1.3-21/src/RODBC.c 2022-12-05 21:29:32.000000000 +0000 +++ rodbc-1.3-22/src/RODBC.c 2023-11-21 17:19:24.000000000 +0000 @@ -818,7 +818,7 @@ blksize = (buffsize < 100) ? 100: buffsize; } } else { - if(!maximum || maximum > NROWS) maximum = NROWS; + if(!maximum || maximum > NROWS) maximum = (int) NROWS; blksize = maximum; } for(i = 0; i < nc; i++) { @@ -917,7 +917,8 @@ SEXP this = (len == SQL_NULL_DATA) ? allocVector(RAWSXP, 0) : mkRaw(thisHandle->ColData[i].pData + - (thisHandle->ColData[i].datalen * row), len); + (thisHandle->ColData[i].datalen * row), + (unsigned int) len); SET_VECTOR_ELT(VECTOR_ELT(data, i), j-1, this); break; } @@ -1024,14 +1025,14 @@ SEXP params, SEXP test) { pRODBCHandle thisHandle = R_ExternalPtrAddr(chan); - int rows, i, j, k, stat = 1, vtest = asInteger(test), nparams; + int rows, i, k, stat = 1, vtest = asInteger(test), nparams; int *sequence = INTEGER(dataseq); const char *cquery = translateChar(STRING_ELT(query, 0)); SQLRETURN res = 0; /* -Wall */ SEXP paramnames = VECTOR_ELT(params, 0); nparams = length(paramnames); - NCOLS = nparams; + NCOLS = (SQLSMALLINT)nparams; clearresults(thisHandle); @@ -1062,18 +1063,17 @@ thisHandle->nAllocated = NCOLS; /* extract the column data */ - for(j = 0; j < nparams; j++) { - int tmp; + for(short j = 0; j < nparams; j++) { strcpy((char *) thisHandle->ColData[j].ColName, translateChar(STRING_ELT(paramnames, j))); thisHandle->ColData[j].DataType = INTEGER(VECTOR_ELT(params, 1))[j]; thisHandle->ColData[j].ColSize = INTEGER(VECTOR_ELT(params, 2))[j]; /* I don't think this would be NA, but the code was here */ - tmp = INTEGER(VECTOR_ELT(params, 3))[j]; + int tmp = INTEGER(VECTOR_ELT(params, 3))[j]; thisHandle->ColData[j].DecimalDigits = (tmp == NA_INTEGER) ? 0 : tmp; if(vtest) - Rprintf("Binding: '%s' DataType %d, ColSize %d\n", + Rprintf("Binding: '%s' DataType %d, ColSize %ul\n", (char *) thisHandle->ColData[j].ColName, thisHandle->ColData[j].DataType, thisHandle->ColData[j].ColSize); @@ -1102,7 +1102,7 @@ break; default: { - int datalen = thisHandle->ColData[j].ColSize; + unsigned long datalen = thisHandle->ColData[j].ColSize; /* Why change here but not when sending the data? */ if (datalen <= 0) datalen = 1024; thisHandle->ColData[j].pData = R_Calloc(datalen+1, char); @@ -1130,7 +1130,7 @@ if(vtest) Rprintf("Parameters:\n"); rows = LENGTH(VECTOR_ELT(data, 0)); for(i = 0; i < rows; i++) { - for(j = 0; j < LENGTH(data); j++) { + for(int j = 0; j < LENGTH(data); j++) { k = sequence[j]; /* get the right column */ switch(TYPEOF(VECTOR_ELT(data, k))) { case REALSXP: @@ -1160,7 +1160,7 @@ default: { const char *cData = translateChar(STRING_ELT(VECTOR_ELT(data, k), i)); - int datalen = thisHandle->ColData[j].ColSize; + unsigned long datalen = thisHandle->ColData[j].ColSize; strncpy(thisHandle->ColData[j].pData, cData, datalen); thisHandle->ColData[j].pData[datalen] = '\0'; if(strlen(cData) > datalen)