[r-cran-erm] 15/33: Import Debian patch 0.14-0-1
Andreas Tille
tille at debian.org
Mon Dec 12 11:19:34 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository r-cran-erm.
commit b075891b8f644a473c3bb4d8096e693ccb35e952
Merge: 144c99f 8e387bd
Author: Julian Gilbey <jdg at debian.org>
Date: Sun Mar 18 12:56:18 2012 +0000
Import Debian patch 0.14-0-1
COPYING | 0
COPYRIGHTS | 0
DESCRIPTION | 52 +-
MD5 | 183 ++
NAMESPACE | 12 +
NEWS | 24 +-
R/IC.default.R | 0
R/IC.ppar.r | 0
R/IC.r | 0
R/LLRA.R | 16 +
R/LLTM.R | 0
R/LPCM.R | 0
R/LRSM.R | 0
R/LRtest.R | 0
R/LRtest.Rm.R | 0
R/MLoef.R | 0
R/NPtest.R | 55 +-
R/PCM.R | 0
R/RM.R | 0
R/ROCR_aux.R | 0
R/RSM.R | 0
R/Waldtest.R | 0
R/Waldtest.Rm.R | 0
R/anova.llra.R | 31 +
R/build_W.R | 21 +
R/checkdata.R | 0
R/cmlprep.R | 0
R/coef.eRm.R | 0
R/coef.ppar.R | 0
R/collapse_W.R | 10 +
R/confint.eRm.r | 0
R/confint.ppar.r | 0
R/confint.threshold.r | 0
R/cwdeviance.r | 0
R/datcheck.LRtest.r | 0
R/datcheck.R | 0
R/datprep_LLTM.R | 0
R/datprep_LPCM.R | 0
R/datprep_LRSM.R | 0
R/datprep_PCM.R | 0
R/datprep_RM.R | 0
R/datprep_RSM.R | 0
R/fitcml.R | 0
R/invalid.R | 0
R/itemfit.R | 0
R/itemfit.ppar.R | 0
R/labeling.internal.r | 0
R/likLR.R | 0
R/llra.datprep.R | 43 +
R/llra.internals.R | 107 +
R/logLik.eRm.r | 0
R/logLik.ppar.r | 0
R/model.matrix.eRm.R | 0
R/performance.R | 0
R/performance_measures.R | 0
R/performance_plots.R | 0
R/person.parameter.R | 0
R/person.parameter.eRm.R | 0
R/personfit.R | 0
R/personfit.ppar.R | 0
R/pifit.internal.r | 0
R/plist.internal.R | 0
R/plot.ppar.r | 0
R/plotCI.R | 0
R/plotDIF.R | 287 +-
R/plotGOF.LR.R | 42 +-
R/plotGOF.R | 0
R/plotGR.R | 54 +
R/plotICC.R | 0
R/plotICC.Rm.R | 0
R/plotPImap.R | 0
R/plotPWmap.R | 0
R/plotTR.R | 31 +
R/plotjointICC.R | 0
R/plotjointICC.dRm.R | 0
R/pmat.R | 0
R/pmat.default.R | 0
R/pmat.ppar.R | 0
R/prediction.R | 0
R/print.ICr.r | 0
R/print.LR.R | 0
R/print.MLoef.r | 2 +-
R/print.eRm.R | 0
R/print.ifit.R | 0
R/print.llra.R | 10 +
R/print.logLik.eRm.R | 0
R/print.logLik.ppar.r | 0
R/print.pfit.R | 0
R/print.ppar.R | 0
R/print.resid.R | 0
R/print.step.r | 0
R/print.summary.llra.R | 20 +
R/print.threshold.r | 0
R/print.wald.R | 0
R/residuals.ppar.R | 0
R/sim.2pl.R | 0
R/sim.locdep.R | 0
R/sim.rasch.R | 0
R/sim.xdim.R | 0
R/stepwiseIt.R | 0
R/stepwiseIt.eRm.R | 0
R/summary.LR.r | 0
R/summary.MLoef.r | 0
R/summary.eRm.R | 0
R/summary.llra.R | 17 +
R/summary.ppar.R | 0
R/summary.threshold.r | 0
R/thresholds.eRm.r | 0
R/thresholds.r | 0
R/vcov.eRm.R | 0
R/zzz.R | 8 +-
data/llraDat1.rda | Bin 0 -> 2569 bytes
data/llraDat2.rda | Bin 0 -> 1187 bytes
data/llradat3.rda | Bin 0 -> 324 bytes
data/lltmdat1.rda | Bin 955 -> 642 bytes
data/lltmdat2.rda | Bin 125 -> 121 bytes
data/lpcmdat.rda | Bin 213 -> 211 bytes
data/lrsmdat.rda | Bin 317 -> 315 bytes
data/pcmdat.rda | Bin 210 -> 208 bytes
data/pcmdat2.rda | Bin 710 -> 478 bytes
data/raschdat1.rda | Bin 957 -> 641 bytes
data/raschdat2.rda | Bin 156 -> 151 bytes
data/rsmdat.rda | Bin 199 -> 196 bytes
debian/changelog | 10 +
debian/compat | 2 +-
debian/control | 6 +-
debian/copyright | 69 +-
debian/patches/02_plotPWmap-fix-subsetting | 70 +
debian/patches/series | 1 +
debian/rules | 5 +
debian/source/lintian-overrides | 1 -
inst/doc/Rplots.pdf | 4482 ----------------------------
inst/doc/UCML.jpg | Bin
inst/doc/Z.cls | 0
inst/doc/eRm.R | 101 -
inst/doc/eRm.Rnw | 3 +
inst/doc/eRm.pdf | Bin 555998 -> 469512 bytes
inst/doc/eRm_object_tree.pdf | Bin 0 -> 27586 bytes
inst/doc/eRmvig.R | 101 -
inst/doc/eRmvig.Rnw | 1006 -------
inst/doc/eRmvig.bib | 0
inst/doc/eRmvig.pdf | Bin 433168 -> 0 bytes
inst/doc/{index.html => index.html.old} | 0
inst/doc/jss.bst | 0
inst/doc/modelhierarchy.pdf | Bin
man/IC.Rd | 0
man/LLRA.Rd | 136 +
man/LLTM.Rd | 0
man/LPCM.Rd | 0
man/LRSM.Rd | 0
man/LRtest.Rd | 25 +-
man/MLoef.Rd | 21 +-
man/NPtest.Rd | 15 +-
man/PCM.Rd | 0
man/RM.Rd | 0
man/RSM.Rd | 0
man/Waldtest.Rd | 0
man/anova.llra.Rd | 65 +
man/build_W.Rd | 90 +
man/collapse_W.Rd | 76 +
man/eRm-package.Rd | 29 +-
man/gofIRT.Rd | 0
man/itemfit.ppar.Rd | 0
man/llra.datprep.Rd | 70 +
man/llraDat1.Rd | 61 +
man/llraDat2.Rd | 54 +
man/llradat3.Rd | 34 +
man/person.parameter.Rd | 0
man/plotDIF.Rd | 5 +-
man/plotGR.Rd | 57 +
man/plotICC.Rd | 0
man/plotPImap.Rd | 0
man/plotPWmap.Rd | 0
man/plotTR.Rd | 54 +
man/predict.ppar.Rd | 0
man/print.eRm.Rd | 0
man/raschdat.Rd | 0
man/sim.2pl.Rd | 0
man/sim.locdep.Rd | 0
man/sim.rasch.Rd | 0
man/sim.xdim.Rd | 0
man/stepwiseIt.Rd | 0
man/summary.llra.Rd | 69 +
man/thresholds.Rd | 0
src/components.c | 0
src/components.h | 0
src/geodist.c | 0
src/geodist.h | 0
188 files changed, 1799 insertions(+), 5944 deletions(-)
diff --cc debian/changelog
index 019b174,0000000..4e10d9d
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,86 -1,0 +1,96 @@@
++erm (0.14-0-1) unstable; urgency=low
++
++ * New upstream release
++ * Remove now-obsolete dependency and lintian override for cdbs
++ * Update to standards version 3.9.3
++ * Convert copyright file to copyright-format 1.0
++ * Fix bug in plotPWmap subsetting feature
++
++ -- Julian Gilbey <jdg at debian.org> Sun, 18 Mar 2012 12:56:18 +0000
++
+erm (0.13-4.1~svn66-1) unstable; urgency=low
+
+ * New upstream release
+ * Based on SVN revision 66
+ * Update to standards version 3.9.2
+
+ -- Julian Gilbey <jdg at debian.org> Tue, 24 May 2011 20:45:12 +0100
+
+erm (0.13-0-2) unstable; urgency=low
+
+ * Ensure only finite ranges are used in plotPWmap
+
+ -- Julian Gilbey <jdg at debian.org> Wed, 16 Jun 2010 07:10:25 +0100
+
+erm (0.13-0-1) unstable; urgency=low
+
+ * New upstream release
+ * All earlier patches are now incorporated by upstream
+
+ -- Julian Gilbey <jdg at debian.org> Mon, 14 Jun 2010 19:29:28 +0100
+
+erm (0.12-2.3-2) unstable; urgency=low
+
+ * Correct person subsetting
+
+ -- Julian Gilbey <jdg at debian.org> Sun, 06 Jun 2010 13:18:48 +0100
+
+erm (0.12-2.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Upstream now incorporates all of the patches in version 0.12-0-6, so
+ these have been removed from the package (thanks!)
+
+ -- Julian Gilbey <jdg at debian.org> Thu, 03 Jun 2010 11:24:17 +0100
+
+erm (0.12-0-6) unstable; urgency=low
+
+ * Fix showstopping-bug in plotPathwayMap which broke the code if there
+ were any NA values in the data
+ * Rename plotPathwayMap to plotPWMap, following upstream's request
+ * plotPWMap enhancements requested by upstream: Offer options for colour
+ and size of confidence intervals allow plotting both persons and items
+ on same plot; allow not plotting confidence intervals;
+
+ -- Julian Gilbey <jdg at debian.org> Tue, 01 Jun 2010 11:35:33 +0100
+
+erm (0.12-0-5) unstable; urgency=low
+
+ * Fixed incorrect Build-Depends; hopefully this will work, but can't be
+ sure as pbuilder isn't working (bug in util-linux) (Closes: #583770)
+
+ -- Julian Gilbey <jdg at debian.org> Sun, 30 May 2010 19:47:44 +0100
+
+erm (0.12-0-4) unstable; urgency=low
+
+ * Fixed incorrect variable name in plotPathwayMap (thanks to Reinhold
+ Hatzinger again)
+
+ -- Julian Gilbey <jdg at debian.org> Sun, 23 May 2010 23:49:55 +0100
+
+erm (0.12-0-3) unstable; urgency=low
+
+ * Fix bug with plotPathwayMap - failed if pp was not given as a
+ parameter
+ * Allow more colour possibilities for nonordinal warnings in plotPImap
+ (with thanks to Reinhold Hatzinger for suggesting this)
+
+ -- Julian Gilbey <jdg at debian.org> Mon, 17 May 2010 21:54:21 +0100
+
+erm (0.12-0-2) unstable; urgency=low
+
+ * Fixed dRM -> dRm bug in plotPImap
+ * Fixed missing warning labels in plotPImap
+
+ -- Julian Gilbey <jdg at debian.org> Sun, 16 May 2010 21:53:16 +0100
+
+erm (0.12-0-1) unstable; urgency=low
+
+ * Initial Debian release (Closes: #544402)
+ * Fixed subsetting bugs in plotPImap code, and allowed reuse of
+ person.parameter calculations
+ * Added Infit and Outfit t statistics, as per Rating Scale Analysis by
+ Wright and Masters
+ * Added ability to plot (slightly modified) Bond-and-Fox Pathway Maps
+
+ -- Julian Gilbey <jdg at debian.org> Sun, 16 May 2010 17:13:21 +0100
diff --cc debian/compat
index 45a4fb7,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 8
++9
diff --cc debian/control
index 7a1dd14,0000000..0e74af1
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,24 -1,0 +1,24 @@@
+Source: erm
+Section: gnu-r
+Priority: optional
+Maintainer: Julian Gilbey <jdg at debian.org>
- Build-Depends: debhelper (>> 8), r-base-dev (>= 2.9.0-4), cdbs, r-cran-mass,
++Build-Depends: debhelper (>> 9), cdbs, r-base-dev (>= 2.13.0-2), r-cran-mass,
+ r-cran-raschsampler
- Standards-Version: 3.9.2
++Standards-Version: 3.9.3
+Homepage: http://cran.r-project.org/web/packages/eRm/index.html
+
+Package: r-cran-erm
+Architecture: any
- Depends: r-base-core (>= 2.8.1), r-cran-mass,
++Depends: r-base-core (>= 2.12.0), r-cran-mass,
+ r-cran-raschsampler, ${shlibs:Depends}, ${misc:Depends}
+Description: GNU R package for 'extended Rasch modelling'
+ eRm fits Rasch models (RM), linear logistic test models (LLTM),
+ rating scale model (RSM), linear rating scale models (LRSM), partial
+ credit models (PCM), and linear partial credit models (LPCM). Missing
+ values are allowed in the data matrix. Additional features are the ML
+ estimation of the person parameters, Andersen's LR-test,
+ item-specific Wald test, itemfit and personfit statistics including
+ infit and outfit measures, various ICC and related plots, automated
+ stepwise item elimination, simulation module for various binary data
+ matrices. An eRm platform is provided at R-forge (see URL).
+
diff --cc debian/copyright
index e466a7d,0000000..d047bd6
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,17 -1,0 +1,58 @@@
- This is the Debian GNU/Linux r-cran-erm package of eRm, a package
- providing 'extended Rasch modeling' for GNU R. eRm was written by
- Patrick Mairand Reinhold Hatzinger.
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: eRm
++Upstream-Contact: Reinhold Hatzinger <reinhold.hatzinger at wu.ac.at>
++Source: http://cran.r-project.org/web/packages/eRm/index.html
++License: GPL-2
++Copyright: 2007 Patrick Mair and Reinhold Hatzinger
++Comment: The package was renamed from its upstream name 'eRm' to
++ 'r-cran-erm to fit the pattern of Debian CRAN (and non-CRAN)
++ packages for R.
+
- This package was created by Julian Gilbey <jdg at debian.org>.
- The sources were downloaded from
- http://cran.r-project.org/web/packages/eRm/index.html
++Files: *
++Copyright: 2007 Patrick Mair and Reinhold Hatzinger
++License: GPL-2
+
- The package was renamed from its upstream name 'eRm' to 'r-cran-erm'
- to fit the pattern of Debian CRAN (and non-CRAN) packages for R.
++Files: debian/*
++Copyright: 2010-2012 Julian Gilbey <jdg at debian.org>
++License: GPL-2+
++ 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 the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later
++ version.
++ .
++ This program is distributed in the hope that it will be
++ useful, but WITHOUT ANY WARRANTY; without even the implied
++ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
++ PURPOSE. See the GNU General Public License for more
++ details.
++ .
++ You should have received a copy of the GNU General Public
++ License along with this package; if not, write to the Free
++ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ Boston, MA 02110-1301 USA.
++ .
++ On Debian systems, the full text of the GNU General Public
++ License version 2 can be found in the file
++ `/usr/share/common-licenses/GPL-2'.
+
- Copyright (C) 2007 Patrick Mair and Reinhold Hatzinger
-
- License: GPL version 2
-
- On a Debian GNU/Linux system, the GPL license is included in the file
- /usr/share/common-licenses/GPL-2
++License: GPL-2
++ This program is free software; you can redistribute it
++ and/or modify it under the terms of version 2 of the GNU
++ General Public License as published by the Free Software
++ Foundation.
++ .
++ This program is distributed in the hope that it will be
++ useful, but WITHOUT ANY WARRANTY; without even the implied
++ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
++ PURPOSE. See the GNU General Public License for more
++ details.
++ .
++ You should have received a copy of the GNU General Public
++ License along with this package; if not, write to the Free
++ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ Boston, MA 02110-1301 USA.
++ .
++ On Debian systems, the full text of the GNU General Public
++ License version 2 can be found in the file
++ `/usr/share/common-licenses/GPL-2'.
diff --cc debian/patches/02_plotPWmap-fix-subsetting
index 0000000,0000000..cc05f52
new file mode 100644
--- /dev/null
+++ b/debian/patches/02_plotPWmap-fix-subsetting
@@@ -1,0 -1,0 +1,70 @@@
++--- a/R/plotPWmap.R
+++++ b/R/plotPWmap.R
++@@ -86,16 +86,17 @@
++ stop("item.subset misspecified. Use 'all' or vector of at least two valid item indices/names.")
++ } else {
++ if (length(item.subset)>1 && all(item.subset %in% rownames(as.matrix(tl)))) {
++- iloc <- iloc[item.subset]
++- ise <- ise[item.subset]
++- ifitZ <- ifitZ[item.subset]
++ tl <- tl[item.subset]
++-
+++ keep.subset <- c()
++ for (i in rownames(as.matrix(tl)))
++ if (tl[i]==1)
++ keep.subset<-c(keep.subset,i)
++ else
++ keep.subset<-c(keep.subset,paste(i,1:tl[i],sep=":"))
+++
+++ iloc <- iloc[keep.subset]
+++ ise <- ise[keep.subset]
+++ ifitZ <- ifitZ[item.subset]
++ tt<-tt[keep.subset,]
++ }
++ else if(length(item.subset)!=1 || !(item.subset=="all"))
++@@ -115,16 +116,17 @@
++ }
++ else {
++ if (length(item.subset)>1 && all(item.subset %in% 1:length(tl))) {
++- iloc <- iloc[item.subset]
++- ise <- ise[item.subset]
++- ifitZ <- ifitZ[item.subset]
++ tl <- tl[item.subset]
++-
+++ keep.subset <- c()
++ for (i in rownames(as.matrix(tl)))
++ if (tl[i]==1)
++ keep.subset<-c(keep.subset,i)
++ else
++ keep.subset<-c(keep.subset,paste(i,1:tl[i],sep=":"))
+++
+++ iloc <- iloc[keep.subset]
+++ ise <- ise[keep.subset]
+++ ifitZ <- ifitZ[item.subset]
++ tt<-tt[keep.subset,]
++ }
++ else
++@@ -255,15 +257,15 @@
++ zt <- rep(ifitZ,times=tl)
++
++ if (!horiz){
++- if (ici>0) ## draw confidence intervals
++- arrows(zt,iloc+ici*ise, zt,iloc-ici*ise, angle=90, code=3, length=0.04,
++- col=itemCI$col, lty=itemCI$lty)
++- points(zt,iloc,pch=item.pch,cex=cex.pch)
++- text(zt,iloc,rownames(tt),cex=cex.gen,pos=4)
+++ if (ici>0) ## draw confidence intervals
+++ arrows(zt,iloc+ici*ise, zt,iloc-ici*ise, angle=90, code=3, length=0.04,
+++ col=itemCI$col, lty=itemCI$lty)
+++ points(zt,iloc,pch=item.pch,cex=cex.pch)
+++ text(zt,iloc,rownames(tt),cex=cex.gen,pos=4)
++ } else {
++- if (ici>0) ## draw confidence intervals
++- arrows(iloc+ici*ise, zt,iloc-ici*ise,zt, angle=90, code=3, length=0.04,
++- col=itemCI$col, lty=itemCI$lty)
+++ if (ici>0) ## draw confidence intervals
+++ arrows(iloc+ici*ise, zt,iloc-ici*ise,zt, angle=90, code=3, length=0.04,
+++ col=itemCI$col, lty=itemCI$lty)
++ points(iloc, zt,pch=item.pch,cex=cex.pch)
++ text(iloc,zt, rownames(tt),cex=cex.gen,pos=4)
++ }
diff --cc debian/patches/series
index dbb6c58,0000000..5105e60
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
+01_plotPWmap-fix-ranges
++02_plotPWmap-fix-subsetting
diff --cc debian/rules
index 14fc53d,0000000..98fd3fe
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,8 -1,0 +1,13 @@@
+#!/usr/bin/make -f
+# debian/rules file for the Debian/GNU Linux r-cran-* packages
+
++# We don't want to include the cdbs patchsys, as we're using source
++# format 3.0 (quilt). The following line makes cdbs skip trying to
++# load it (it is included by /usr/share/R/debian/r-cran.mk).
++_cdbs_rules_patchsys = 1
++
+include /usr/share/R/debian/r-cran.mk
+
+# Fix the borken permissions :-(
+install/r-cran-erm::
+ chmod a-x debian/r-cran-erm/usr/lib/R/site-library/eRm/doc/*
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-erm.git
More information about the debian-science-commits
mailing list