diff -Nru r-cran-class-7.3-14/debian/changelog r-cran-class-7.3-15/debian/changelog --- r-cran-class-7.3-14/debian/changelog 2019-01-02 08:50:24.000000000 +0000 +++ r-cran-class-7.3-15/debian/changelog 2019-01-01 14:51:29.000000000 +0000 @@ -1,14 +1,27 @@ -r-cran-class (7.3-14-2build2) cosmic; urgency=medium +r-cran-class (7.3-15-1) unstable; urgency=medium - * No-change rebuild for the r-api change. + * New upstream release + + * debian/control: Set Build-Depends: to current R version + * debian/control: Set Standards-Version: to current version - -- Matthias Klose Thu, 31 May 2018 14:32:58 +0000 + -- Dirk Eddelbuettel Tue, 01 Jan 2019 08:51:29 -0600 -r-cran-class (7.3-14-2build1) artful; urgency=medium +r-cran-class (7.3-14-2.1) unstable; urgency=medium - * No-change rebuild to pick up r-api-3.4 + * (Inofficial) Rebuild for R 3.5.0 - -- Graham Inggs Wed, 27 Sep 2017 13:58:07 +0000 + * Manual override for ${R:Depends} while dh-r is looked at + + * debian/control: Set Build-Depends: to current R version + * debian/control: Set Standards-Version: to current version + * debian/control: Add Depends: on ${misc:Depends} + * 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 Sat, 28 Apr 2018 14:42:46 -0500 r-cran-class (7.3-14-2) unstable; urgency=medium diff -Nru r-cran-class-7.3-14/debian/compat r-cran-class-7.3-15/debian/compat --- r-cran-class-7.3-14/debian/compat 2019-01-02 08:50:24.000000000 +0000 +++ r-cran-class-7.3-15/debian/compat 2018-04-28 19:39:54.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru r-cran-class-7.3-14/debian/control r-cran-class-7.3-15/debian/control --- r-cran-class-7.3-14/debian/control 2019-01-02 08:50:24.000000000 +0000 +++ r-cran-class-7.3-15/debian/control 2019-01-01 14:51:29.000000000 +0000 @@ -2,14 +2,16 @@ Section: gnu-r Priority: optional Maintainer: Dirk Eddelbuettel -Build-Depends: debhelper (>= 7.0.0), r-base-dev (>= 3.4.0), r-cran-mass, cdbs -Standards-Version: 3.9.8 -Homepage: http://cran.r-project.org/web/packages/class/index.html +Build-Depends: debhelper (>= 7.0.0), r-base-dev (>= 3.5.2), r-cran-mass, dh-r +Standards-Version: 4.3.0 +Vcs-Browser: https://salsa.debian.org/edd/r-cran-class +Vcs-Git: https://salsa.debian.org/edd/r-cran-class.git +Homepage: https://cran.r-project.org/package=class Package: r-cran-class Architecture: any Replaces: r-cran-vr (<< 7.3-0) -Depends: ${shlibs:Depends}, ${misc:Depends}, ${R:Depends}, r-cran-mass +Depends: r-base-core (>= 3.5.0-1), r-api-3.5, ${shlibs:Depends}, ${misc:Depends}, r-cran-mass Description: GNU R package for classification The class package provides functions and datasets to support chapter 12 on 'Classification' in the book 'Modern Applied Statistics with S' diff -Nru r-cran-class-7.3-14/debian/rules r-cran-class-7.3-15/debian/rules --- r-cran-class-7.3-14/debian/rules 2019-01-02 08:50:24.000000000 +0000 +++ r-cran-class-7.3-15/debian/rules 2018-04-28 19:40:04.000000000 +0000 @@ -1,7 +1,8 @@ #!/usr/bin/make -f # -*- makefile -*- # debian/rules file for the Debian/GNU Linux r-cran-class package -# Copyright 2005 - 2009 by Dirk Eddelbuettel +# Copyright 2005 - 2018 by Dirk Eddelbuettel -include /usr/share/R/debian/r-cran.mk +%: + dh $@ --buildsystem R diff -Nru r-cran-class-7.3-14/debian/source/format r-cran-class-7.3-15/debian/source/format --- r-cran-class-7.3-14/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ r-cran-class-7.3-15/debian/source/format 2013-09-06 11:05:46.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru r-cran-class-7.3-14/DESCRIPTION r-cran-class-7.3-15/DESCRIPTION --- r-cran-class-7.3-14/DESCRIPTION 2015-08-30 06:59:39.000000000 +0000 +++ r-cran-class-7.3-15/DESCRIPTION 2019-01-01 09:57:46.000000000 +0000 @@ -1,7 +1,7 @@ Package: class Priority: recommended -Version: 7.3-14 -Date: 2015-08-29 +Version: 7.3-15 +Date: 2019-01-01 Depends: R (>= 3.0.0), stats, utils Imports: MASS Authors@R: c(person("Brian", "Ripley", role = c("aut", "cre", "cph"), @@ -14,9 +14,9 @@ License: GPL-2 | GPL-3 URL: http://www.stats.ox.ac.uk/pub/MASS4/ NeedsCompilation: yes -Packaged: 2015-08-28 15:25:36 UTC; ripley +Packaged: 2019-01-01 08:04:06 UTC; ripley Author: Brian Ripley [aut, cre, cph], William Venables [cph] Maintainer: Brian Ripley Repository: CRAN -Date/Publication: 2015-08-30 08:59:38 +Date/Publication: 2019-01-01 09:57:46 UTC Binary files /tmp/tmpCEdZNw/Sa_kX5fU_Y/r-cran-class-7.3-14/inst/po/en@quot/LC_MESSAGES/R-class.mo and /tmp/tmpCEdZNw/y9X0KKYuvP/r-cran-class-7.3-15/inst/po/en@quot/LC_MESSAGES/R-class.mo differ diff -Nru r-cran-class-7.3-14/MD5 r-cran-class-7.3-15/MD5 --- r-cran-class-7.3-14/MD5 2015-08-30 06:59:39.000000000 +0000 +++ r-cran-class-7.3-15/MD5 2019-01-01 09:57:46.000000000 +0000 @@ -1,4 +1,4 @@ -fb3bf5b0195fbe9b98a9280872ece454 *DESCRIPTION +a2458bf8d86b669a7656fc5ace1bbefa *DESCRIPTION 5eebfdd24e8b4bbc1a0e6fbda79d194d *LICENCE.note a92febb02a17971969afc1e4e4067279 *NAMESPACE 44e5755ae2d5d1f1b8509879577c17a5 *R/SOM.R @@ -9,7 +9,7 @@ 3bad31311a37fe2f39e9c2ad876ab94c *inst/CITATION e042788d6870b70eb8ea0bc5f01391ff *inst/NEWS 2d4884f2f724beae0767bf44efa59598 *inst/po/de/LC_MESSAGES/R-class.mo -677b90f7ab673c399567292cf2f3f782 *inst/po/en@quot/LC_MESSAGES/R-class.mo +53216579bd1b93c6f8e4653cf7d6fb7c *inst/po/en@quot/LC_MESSAGES/R-class.mo d10745a6ccb433aeeb6ed691dfdf8918 *inst/po/fr/LC_MESSAGES/R-class.mo 3c13e6d55396b92fd24b58b756b03ac4 *inst/po/ko/LC_MESSAGES/R-class.mo e2a420dc42a1b708f25f73dbb89a8abb *inst/po/pl/LC_MESSAGES/R-class.mo @@ -28,9 +28,9 @@ 11a66b273c6dc182cc05bb2bc53fdb54 *man/olvq1.Rd 401fc2d0327911732fd84ccd817e41e5 *man/reduce.nn.Rd 04d8b8fb49626fa41093f3b19ce5edbf *man/somgrid.Rd -b429d312008b1093f1f768506a25e686 *po/R-class.pot +d6d57866d0b39bb128abce9b8ba920a3 *po/R-class.pot 98593b35ec7a47e8442acbbe9feb6846 *po/R-de.po 3195cdd61375917b1dec4d2521cc5ea8 *po/R-fr.po 161dc97e9c24260b24b9304c3f69d642 *po/R-ko.po 4fcc24f341019a4f3101815fd34f960c *po/R-pl.po -045e79c0d1da224a2e90b92418afb89f *src/class.c +e74edc8ed027013f6d6b838eab7d0bc3 *src/class.c diff -Nru r-cran-class-7.3-14/po/R-class.pot r-cran-class-7.3-15/po/R-class.pot --- r-cran-class-7.3-14/po/R-class.pot 2015-02-07 20:43:03.000000000 +0000 +++ r-cran-class-7.3-15/po/R-class.pot 2018-10-16 10:03:02.000000000 +0000 @@ -1,7 +1,7 @@ msgid "" msgstr "" -"Project-Id-Version: class 7.3-11\n" -"POT-Creation-Date: 2015-02-07 20:43\n" +"Project-Id-Version: class 7.3-14\n" +"POT-Creation-Date: 2018-04-07 21:15\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru r-cran-class-7.3-14/src/class.c r-cran-class-7.3-15/src/class.c --- r-cran-class-7.3-14/src/class.c 2015-08-28 15:25:36.000000000 +0000 +++ r-cran-class-7.3-15/src/class.c 2019-01-01 08:01:48.000000000 +0000 @@ -1,5 +1,5 @@ /* - * class/src/class.c by W. N. Venables and B. D. Ripley Copyright (C) 1994-2002 + * class/src/class.c by W. N. Venables and B. D. Ripley Copyright (C) 1994-2018 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,6 +16,7 @@ * */ +#include // currently in R.h #include #include #include @@ -394,7 +395,9 @@ /* pick a random data point */ i = (int)(n * UNIF); /* find the nearest code 'near' */ - nind = 0; dm = DOUBLE_XMAX; + /* nind is the number of tied minima, unlike VR_knn1 */ + nind = 1; // for compilers: set to 1 when first min found. + dm = DOUBLE_XMAX; for (cd = 0; cd < ncodes; cd++) { dist = 0.0; for (j = 0; j < p; j++) { @@ -403,7 +406,7 @@ } if (dist <= dm * (1 + EPS)) { if (dist < dm * (1 - EPS)) { - nind = 0; + nind = 1; nearest = cd; } else { if(++nind * UNIF < 1.0) nearest = cd; @@ -435,12 +438,9 @@ {NULL, NULL, 0} }; -#include void R_init_class(DllInfo *dll) { R_registerRoutines(dll, CEntries, NULL, NULL, NULL); R_useDynamicSymbols(dll, FALSE); -#if defined(R_VERSION) && R_VERSION >= R_Version(2, 16, 0) R_forceSymbols(dll, TRUE); -#endif }