Merge lp:~scarneiro/ubuntu/oneiric/r-cran-surveillance/fix-for-755927 into lp:ubuntu/oneiric/r-cran-surveillance

[Sebastian Carneiro]

Replaced r-cran-vr from Build-Depends since it conflicts with other dependencies, and added r-cran-mass to Build-Dependencies, since it is necessary.

Tested binary package in Oneiric loading it into R environment, as stated in README.Debian.

Any change or correction, please let me know.

Best regards.

[Stefano Rivera (stefanor)]

Looks good, uploaded, please forward this patch to Debian

[Sebastian Carneiro (scarneiro)]

Patch forwarded to Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=631141

Best regards,

Sebastian.

=== modified file 'debian/changelog'
--- debian/changelog	2010-06-25 13:36:17 +0000
+++ debian/changelog	2011-06-16 01:04:31 +0000
@@ -1,3 +1,10 @@
+r-cran-surveillance (1.2-1-1ubuntu1) oneiric; urgency=low
+
+  * debian/control: Removed r-cran-vr from Build-Depends to solve conflict.
+    Added r-cran-mass to Build-Depends (LP: #755927)
+
+ -- Sebastian Carneiro <[e-mail]>  Wed, 15 Jun 2011 21:55:41 -0300
+
 r-cran-surveillance (1.2-1-1) unstable; urgency=low
 
   * New upstream version
 
=== modified file 'debian/control'
--- debian/control	2010-06-04 13:31:40 +0000
+++ debian/control	2011-06-16 01:04:31 +0000
@@ -5,7 +5,7 @@
 Uploaders: Andreas Tille <[e-mail]>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0), cdbs, r-base-dev, r-cran-xtable,  r-cran-spc,
- r-cran-maptools, r-cran-vcd, r-cran-msm, r-cran-vr, r-cran-colorspace, r-cran-matrix
+ r-cran-maptools, r-cran-vcd, r-cran-msm, r-cran-mass, r-cran-colorspace, r-cran-matrix
 Standards-Version: 3.8.4
 Homepage: http://surveillance.r-forge.r-project.org
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/R/r-cran-surveillance/trunk/?rev=0&sc=0