[rkward-cvs] SF.net SVN: rkward-code:[4670] branches/external_plugins/rk.FactorAnalysis
m-eik at users.sf.net
m-eik at users.sf.net
Thu Apr 4 19:44:59 UTC 2013
Revision: 4670
http://sourceforge.net/p/rkward/code/4670
Author: m-eik
Date: 2013-04-04 19:44:59 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
debianizing the plugin and fixing the inclusion error
Modified Paths:
--------------
branches/external_plugins/rk.FactorAnalysis/ChangeLog
branches/external_plugins/rk.FactorAnalysis/DESCRIPTION
branches/external_plugins/rk.FactorAnalysis/R/rk.FactorAnalysis-package.R
branches/external_plugins/rk.FactorAnalysis/inst/CITATION
branches/external_plugins/rk.FactorAnalysis/inst/NEWS.Rd
branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/Factoranalysis.js
branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/Factoranalysis.xml
branches/external_plugins/rk.FactorAnalysis/inst/rkward/rk.FactorAnalysis.pluginmap
branches/external_plugins/rk.FactorAnalysis/inst/rkward/rkwarddev_plugin_script_FA.R
branches/external_plugins/rk.FactorAnalysis/man/rk.FactorAnalysis-package.Rd
Added Paths:
-----------
branches/external_plugins/rk.FactorAnalysis/debian/
branches/external_plugins/rk.FactorAnalysis/debian/changelog
branches/external_plugins/rk.FactorAnalysis/debian/compat
branches/external_plugins/rk.FactorAnalysis/debian/control
branches/external_plugins/rk.FactorAnalysis/debian/copyright
branches/external_plugins/rk.FactorAnalysis/debian/rules
branches/external_plugins/rk.FactorAnalysis/debian/source/
branches/external_plugins/rk.FactorAnalysis/debian/source/format
Modified: branches/external_plugins/rk.FactorAnalysis/ChangeLog
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/ChangeLog 2013-04-04 19:44:27 UTC (rev 4669)
+++ branches/external_plugins/rk.FactorAnalysis/ChangeLog 2013-04-04 19:44:59 UTC (rev 4670)
@@ -1,5 +1,11 @@
ChangeLog for package rk.FactorAnalysis
+changes in version 0.01-11 (2013-04-04)
+added:
+ - debianized the plugin
+fixed:
+ - removed erroneous pluginmap inclusions from XML files
+
changes in version 0.01-10 (2013-02-24)
changed:
- updated rkwarddev generator script (compatibility with 0.06-2) and regenerated plugin code
Modified: branches/external_plugins/rk.FactorAnalysis/DESCRIPTION
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/DESCRIPTION 2013-04-04 19:44:27 UTC (rev 4669)
+++ branches/external_plugins/rk.FactorAnalysis/DESCRIPTION 2013-04-04 19:44:59 UTC (rev 4670)
@@ -1,8 +1,8 @@
Package: rk.FactorAnalysis
Type: Package
Title: RKWard GUI to conduct principal component and factor analysis
-Version: 0.01-10
-Date: 2013-02-24
+Version: 0.01-11
+Date: 2013-04-04
Author: Meik Michalke <meik.michalke at hhu.de>
Maintainer: Meik Michalke <meik.michalke at hhu.de>
Depends:
Modified: branches/external_plugins/rk.FactorAnalysis/R/rk.FactorAnalysis-package.R
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/R/rk.FactorAnalysis-package.R 2013-04-04 19:44:27 UTC (rev 4669)
+++ branches/external_plugins/rk.FactorAnalysis/R/rk.FactorAnalysis-package.R 2013-04-04 19:44:59 UTC (rev 4670)
@@ -3,8 +3,8 @@
#' \tabular{ll}{
#' Package: \tab rk.FactorAnalysis\cr
#' Type: \tab Package\cr
-#' Version: \tab 0.01-10\cr
-#' Date: \tab 2013-02-24\cr
+#' Version: \tab 0.01-11\cr
+#' Date: \tab 2013-04-04\cr
#' Depends: \tab rkward (>= 0.5.6)\cr
#' Enhances: \tab rkward\cr
#' License: \tab GPL (>= 3)\cr
Added: branches/external_plugins/rk.FactorAnalysis/debian/changelog
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/debian/changelog (rev 0)
+++ branches/external_plugins/rk.FactorAnalysis/debian/changelog 2013-04-04 19:44:59 UTC (rev 4670)
@@ -0,0 +1,6 @@
+r-other-rkward-rk-factoranalysis (0.01-11-1) unstable; urgency=low
+
+ * new upstream release
+
+ -- m.eik michalke <meik.michalke at hhu.de> Thu, 04 Apr 2013 21:28:11 +0000
+
Added: branches/external_plugins/rk.FactorAnalysis/debian/compat
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/debian/compat (rev 0)
+++ branches/external_plugins/rk.FactorAnalysis/debian/compat 2013-04-04 19:44:59 UTC (rev 4670)
@@ -0,0 +1 @@
+7
Added: branches/external_plugins/rk.FactorAnalysis/debian/control
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/debian/control (rev 0)
+++ branches/external_plugins/rk.FactorAnalysis/debian/control 2013-04-04 19:44:59 UTC (rev 4670)
@@ -0,0 +1,15 @@
+Source: r-other-rkward-rk-factoranalysis
+Section: math
+Priority: optional
+Maintainer: m.eik michalke <meik.michalke at hhu.de>
+Build-Depends-Indep: debhelper (>> 4.1.0), r-base-dev (>= 2.9.0), cdbs, rkward (>= 0.5.6)
+Standards-Version: 3.9.3.1
+Homepage: http://rkward.sf.net
+
+Package: r-other-rkward-rk-factoranalysis
+Architecture: all
+Section: math
+Depends: r-base (>= 2.15.0), rkward (>= 0.5.6)
+Description: GNU R package: RKWard GUI to conduct principal component and factor analysis (using the psych package). Also includes
+ dialogs for scree plots, correlation plots, VSS/MAP and parallel analysis.
+Homepage: http://rkward.sf.net
Added: branches/external_plugins/rk.FactorAnalysis/debian/copyright
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/debian/copyright (rev 0)
+++ branches/external_plugins/rk.FactorAnalysis/debian/copyright 2013-04-04 19:44:59 UTC (rev 4670)
@@ -0,0 +1,18 @@
+The R library rk.FactorAnalysis was originally written and is maintained by Meik Michalke <meik.michalke at hhu.de>.
+
+This Debian package was put together m.eik michalke <meik.michalke at hhu.de>.
+
+The package was renamed from its upstream name 'rk.FactorAnalysis' to
+'r-other-rkward-rk-factoranalysis' in harmony with the R packaging policy to indicate
+that the package is external to the CRAN or BioC repositories.
+
+rk.FactorAnalysis Copyright (C) 2013 Meik Michalke, released under the
+GNU General Public License (GPL) version 3 or (at your option) any later version.
+
+This software 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.
+
+You should have received a copy of the license with your Debian system,
+in the file /usr/share/common-licenses/GPL-3, or with the
+source package as the file COPYING or LICENSE.
Added: branches/external_plugins/rk.FactorAnalysis/debian/rules
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/debian/rules (rev 0)
+++ branches/external_plugins/rk.FactorAnalysis/debian/rules 2013-04-04 19:44:59 UTC (rev 4670)
@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# debian/rules file for the Debian/GNU Linux r-other-rkward-rk-factoranalysis package
+# Copyright 2013 by m.eik michalke <meik.michalke at hhu.de>
+
+debRreposname := other-rkward
+
+include /usr/share/R/debian/r-cran.mk
+
+# Require a number equal or superior than the R version the package was built with.
+install/$(package)::
+ echo "R:Depends=r-base-core (>= $(shell R --version | head -n1 | perl -ne 'print / +([0-9]\.[0-9]+\.[0-9])/')~)" >> debian/$(package).substvars
Property changes on: branches/external_plugins/rk.FactorAnalysis/debian/rules
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/external_plugins/rk.FactorAnalysis/debian/source/format
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/debian/source/format (rev 0)
+++ branches/external_plugins/rk.FactorAnalysis/debian/source/format 2013-04-04 19:44:59 UTC (rev 4670)
@@ -0,0 +1 @@
+3.0 (quilt)
Modified: branches/external_plugins/rk.FactorAnalysis/inst/CITATION
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/inst/CITATION 2013-04-04 19:44:27 UTC (rev 4669)
+++ branches/external_plugins/rk.FactorAnalysis/inst/CITATION 2013-04-04 19:44:59 UTC (rev 4670)
@@ -2,12 +2,12 @@
title="rk.FactorAnalysis: RKWard GUI to conduct principal component and factor analysis",
author="Meik Michalke",
year="2013",
- note="(Version 0.01-10)",
+ note="(Version 0.01-11)",
url="http://rkward.sf.net",
textVersion =
paste("Michalke, M. (2013). ",
- "rk.FactorAnalysis: RKWard GUI to conduct principal component and factor analysis (Version 0.01-10). ",
+ "rk.FactorAnalysis: RKWard GUI to conduct principal component and factor analysis (Version 0.01-11). ",
"Available from http://rkward.sf.net",
sep=""),
Modified: branches/external_plugins/rk.FactorAnalysis/inst/NEWS.Rd
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/inst/NEWS.Rd 2013-04-04 19:44:27 UTC (rev 4669)
+++ branches/external_plugins/rk.FactorAnalysis/inst/NEWS.Rd 2013-04-04 19:44:59 UTC (rev 4670)
@@ -1,5 +1,17 @@
\name{NEWS}
\title{News for Package 'rk.FactorAnalysis'}
+\section{Changes in rk.FactorAnalysis version 0.01-11 (2013-04-04)}{
+ \subsection{added}{
+ \itemize{
+ \item debianized the plugin
+ }
+ }
+ \subsection{fixed}{
+ \itemize{
+ \item removed erroneous pluginmap inclusions from XML files
+ }
+ }
+}
\section{Changes in rk.FactorAnalysis version 0.01-10 (2013-02-24)}{
\subsection{changed}{
\itemize{
Modified: branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/Factoranalysis.js
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/Factoranalysis.js 2013-04-04 19:44:27 UTC (rev 4669)
+++ branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/Factoranalysis.js 2013-04-04 19:44:59 UTC (rev 4670)
@@ -2,7 +2,7 @@
//perhaps don't make changes here, but in the rkwarddev script instead!
// define variables globally
-var isObrot;
+ var isObrot;
function preprocess(){
// add requirements etc. here
Modified: branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/Factoranalysis.xml
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/Factoranalysis.xml 2013-04-04 19:44:27 UTC (rev 4669)
+++ branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/Factoranalysis.xml 2013-04-04 19:44:59 UTC (rev 4670)
@@ -4,7 +4,6 @@
perhaps don't make changes here, but in the rkwarddev script instead! -->
<code file="Factoranalysis.js" />
<help file="Factoranalysis.rkh" />
- <include file="../rk.FactorAnalysis.pluginmap" />
<logic>
<convert id="lgc_rdFctPCA" sources="rad_Fctrngmt.string" mode="equals" standard="PCA" />
<convert id="lgc_rdCrrltn" sources="rad_Crrltnmt.string" mode="equals" standard="fa" />
Modified: branches/external_plugins/rk.FactorAnalysis/inst/rkward/rk.FactorAnalysis.pluginmap
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/inst/rkward/rk.FactorAnalysis.pluginmap 2013-04-04 19:44:27 UTC (rev 4669)
+++ branches/external_plugins/rk.FactorAnalysis/inst/rkward/rk.FactorAnalysis.pluginmap 2013-04-04 19:44:59 UTC (rev 4670)
@@ -18,8 +18,8 @@
name="rk.FactorAnalysis"
shortinfo="RKWard GUI to conduct principal component and factor analysis"
longinfo="RKWard GUI to conduct principal component and factor analysis (using the psych package). Also includes dialogs for scree plots, correlation plots, VSS/MAP and parallel analysis."
- version="0.01-10"
- releasedate="2013-02-24"
+ version="0.01-11"
+ releasedate="2013-04-04"
url="http://rkward.sf.net"
license="GPL (>= 3)"
>
@@ -30,11 +30,6 @@
role="aut, cre"
/>
</about>
- <!--
- <require
- file="path/file.pluginmap"
- />
- -->
<components>
<component
id="cmp_FactoranalysisScreeplot"
@@ -144,12 +139,4 @@
</menu>
</menu>
</hierarchy>
- <!--
- <context id="x11">
- </context>
- -->
- <!--
- <context id="import">
- </context>
- -->
</document>
Modified: branches/external_plugins/rk.FactorAnalysis/inst/rkward/rkwarddev_plugin_script_FA.R
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/inst/rkward/rkwarddev_plugin_script_FA.R 2013-04-04 19:44:27 UTC (rev 4669)
+++ branches/external_plugins/rk.FactorAnalysis/inst/rkward/rkwarddev_plugin_script_FA.R 2013-04-04 19:44:59 UTC (rev 4670)
@@ -18,7 +18,7 @@
person(given="Meik", family="Michalke",
email="meik.michalke at hhu.de", role=c("aut","cre"))),
about=list(desc="RKWard GUI to conduct principal component and factor analysis",
- version="0.01-10", url="http://rkward.sf.net", long.desc="RKWard GUI to conduct principal component and factor analysis (using the psych package). Also includes dialogs for scree plots, correlation plots, VSS/MAP and parallel analysis.")
+ version="0.01-11", url="http://rkward.sf.net", long.desc="RKWard GUI to conduct principal component and factor analysis (using the psych package). Also includes dialogs for scree plots, correlation plots, VSS/MAP and parallel analysis.")
)
dependencies.info <- rk.XML.dependencies(
dependencies=list(rkward.min=ifelse(isTRUE(guess.getter), "0.6.0", "0.5.6")),
Modified: branches/external_plugins/rk.FactorAnalysis/man/rk.FactorAnalysis-package.Rd
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/man/rk.FactorAnalysis-package.Rd 2013-04-04 19:44:27 UTC (rev 4669)
+++ branches/external_plugins/rk.FactorAnalysis/man/rk.FactorAnalysis-package.Rd 2013-04-04 19:44:59 UTC (rev 4670)
@@ -9,8 +9,8 @@
}
\details{
\tabular{ll}{ Package: \tab rk.FactorAnalysis\cr Type:
- \tab Package\cr Version: \tab 0.01-10\cr Date: \tab
- 2013-02-24\cr Depends: \tab rkward (>= 0.5.6)\cr
+ \tab Package\cr Version: \tab 0.01-11\cr Date: \tab
+ 2013-04-04\cr Depends: \tab rkward (>= 0.5.6)\cr
Enhances: \tab rkward\cr License: \tab GPL (>= 3)\cr
LazyLoad: \tab yes\cr URL: \tab http://rkward.sf.net\cr }
More information about the rkward-tracker
mailing list