[r-cran-erm] 02/33: Import Debian patch 0.12-0-2

[Andreas Tille]

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 335087ad17f32b587d7b47ab672823eaefa58f51
Author: Julian Gilbey <jdg at debian.org>
Date:   Sun May 16 21:53:16 2010 +0100

    Import Debian patch 0.12-0-2
---
 debian/changelog                                             |  7 +++++++
 .../{01_plotPImap-fix-item-subset => 01_plotPImap-bugfixes}  |  9 +++++++++
 debian/patches/03_plotPImap-prettify                         | 12 +++++++-----
 debian/patches/series                                        |  2 +-
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b4cabf..73bf7b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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)
diff --git a/debian/patches/01_plotPImap-fix-item-subset b/debian/patches/01_plotPImap-bugfixes
similarity index 78%
rename from debian/patches/01_plotPImap-fix-item-subset
rename to debian/patches/01_plotPImap-bugfixes
index f5f13c7..2a33596 100644
--- a/debian/patches/01_plotPImap-fix-item-subset
+++ b/debian/patches/01_plotPImap-bugfixes
@@ -30,3 +30,12 @@ Last-Update: 2010-05-16
      }
  
      if (sorted)
+@@ -93,7 +93,7 @@
+       text(loc[i],j,rev(rownames(tr)[i]),cex=cex.gen,pos=3)
+ 
+     }
+-    if (warn.ord) axis(4,at=1:nrow(tr),tick=FALSE, labels=warn, padj=-1.5)#,cex.axis=cex.gen)
++    if (warn.ord) axis(4,at=1:nrow(tr),tick=FALSE, labels=warn, hadj=2.5, padj=0.7, las=2)#,cex.axis=cex.gen)
+ 
+     # person parameters
+     par(mar=c(0,4,3,1))
diff --git a/debian/patches/03_plotPImap-prettify b/debian/patches/03_plotPImap-prettify
index 23c4659..c51255f 100644
--- a/debian/patches/03_plotPImap-prettify
+++ b/debian/patches/03_plotPImap-prettify
@@ -18,15 +18,16 @@ Last-Update: 2010-05-13
  {
      def.par <- par(no.readonly = TRUE) # save default, for resetting...
  
-@@ -79,18 +80,23 @@
+@@ -79,18 +80,25 @@
        i<-nrow(tr)+1-j
        assign("trpoints",tr[i,!is.na(tr[i,])])
        npnts<-length(trpoints)
 -      points(sort(trpoints),rep(j,npnts),type="b")
-+      if (warn.ord.colour && !dRM) {
++      if (warn.ord.colour && !dRm) {
 +        if(!all(sort(trpoints)==trpoints)) ptcol="blue" else ptcol="black"
 +      } else
-+         ptcol="black"
++        ptcol="black"
++
 +      if(npnts>1) points(sort(trpoints),rep(j,npnts),type="b",cex=1,col=ptcol)
        if (dRm) {
           lines(xrange*1.5,rep(j,2),lty="dotted")
@@ -43,10 +44,11 @@ Last-Update: 2010-05-13
 -      points(loc[i],j,pch=20,cex=1.5) # plot item locations
 -      text(loc[i],j,rev(rownames(tr)[i]),cex=cex.gen,pos=3)
 +      points(loc[i],j,pch=20,cex=1.5,col=ptcol) # plot item locations
-+      text(loc[i],j,rev(rownames(tr)[i]),cex=cex.gen,pos=3,col=ptcol)
++      # this is too much; obscures the dots with too many data points present
++      # text(loc[i],j,rev(rownames(tr)[i]),cex=cex.gen,pos=3,col=ptcol)
  
      }
-     if (warn.ord) axis(4,at=1:nrow(tr),tick=FALSE, labels=warn, padj=-1.5)#,cex.axis=cex.gen)
+     if (warn.ord) axis(4,at=1:nrow(tr),tick=FALSE, labels=warn, hadj=2.5, padj=0.7, las=2)#,cex.axis=cex.gen)
 --- a/man/plotPImap.Rd
 +++ b/man/plotPImap.Rd
 @@ -14,7 +14,8 @@
diff --git a/debian/patches/series b/debian/patches/series
index 382b7f4..48bf41b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-01_plotPImap-fix-item-subset
+01_plotPImap-bugfixes
 02_plotPImap-pp-reuse
 03_plotPImap-prettify
 04_PathwayMap

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-erm.git