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

Proposed by Sebastian Carneiro
Status: Merged
Merged at revision: 8
Proposed branch: lp:~scarneiro/ubuntu/oneiric/r-cran-surveillance/fix-for-755927
Merge into: lp:ubuntu/oneiric/r-cran-surveillance
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~scarneiro/ubuntu/oneiric/r-cran-surveillance/fix-for-755927
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+64772@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Stefano Rivera (stefanor) wrote :

Looks good, uploaded, please forward this patch to Debian

Revision history for this message
Sebastian Carneiro (scarneiro) wrote :

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

Best regards,

Sebastian.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-06-25 13:36:17 +0000
3+++ debian/changelog 2011-06-16 01:04:31 +0000
4@@ -1,3 +1,10 @@
5+r-cran-surveillance (1.2-1-1ubuntu1) oneiric; urgency=low
6+
7+ * debian/control: Removed r-cran-vr from Build-Depends to solve conflict.
8+ Added r-cran-mass to Build-Depends (LP: #755927)
9+
10+ -- Sebastian Carneiro <scarneiro@speedy.com.ar> Wed, 15 Jun 2011 21:55:41 -0300
11+
12 r-cran-surveillance (1.2-1-1) unstable; urgency=low
13
14 * New upstream version
15
16=== modified file 'debian/control'
17--- debian/control 2010-06-04 13:31:40 +0000
18+++ debian/control 2011-06-16 01:04:31 +0000
19@@ -5,7 +5,7 @@
20 Uploaders: Andreas Tille <tille@debian.org>
21 DM-Upload-Allowed: yes
22 Build-Depends: debhelper (>= 7.0), cdbs, r-base-dev, r-cran-xtable, r-cran-spc,
23- r-cran-maptools, r-cran-vcd, r-cran-msm, r-cran-vr, r-cran-colorspace, r-cran-matrix
24+ r-cran-maptools, r-cran-vcd, r-cran-msm, r-cran-mass, r-cran-colorspace, r-cran-matrix
25 Standards-Version: 3.8.4
26 Homepage: http://surveillance.r-forge.r-project.org
27 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/R/r-cran-surveillance/trunk/?rev=0&sc=0

Subscribers

People subscribed via source and target branches