[med-svn] r6834 - trunk/packages/R/r-other-mott-happy/trunk/debian

[Steffen Möller]

Author: moeller
Date: 2011-05-16 08:09:20 +0000 (Mon, 16 May 2011)
New Revision: 6834

Modified:
   trunk/packages/R/r-other-mott-happy/trunk/debian/control
Log:
Smallish updates.

Modified: trunk/packages/R/r-other-mott-happy/trunk/debian/control
===================================================================
--- trunk/packages/R/r-other-mott-happy/trunk/debian/control	2011-05-15 11:32:32 UTC (rev 6833)
+++ trunk/packages/R/r-other-mott-happy/trunk/debian/control	2011-05-16 08:09:20 UTC (rev 6834)
@@ -5,13 +5,14 @@
 Uploaders: Steffen Moeller <moeller at debian.org>,
  Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 7), cdbs, r-base-dev, r-cran-g.data, r-cran-multicore, r-cran-mass
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://www.well.ox.ac.uk/happy/happyR.shtml
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/R/r-other-mott-happy/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/R/r-other-mott-happy/trunk/
 
 Package: r-other-mott-happy.hbrem
-Replaces: r-other-mott-happy
+Replaces: r-other-mott-happy (<< 2.2-1)
+Conflicts: r-other-mott-happy
 Architecture: any
 Depends: ${shlibs:Depends}, r-base-core (>= 2.10.0), r-cran-g.data, r-cran-multicore, r-cran-mass
 Description: GNU R package for fine-mapping complex diseases
@@ -53,7 +54,7 @@
  help producing larger numbers of observable cross-over events
  and thus help increasing the resolution of the mapping.
  .
- happy is an R interface into the HAPPY C package for fine-mapping
+ Happy is an R interface into the HAPPY C package for fine-mapping
  Quantitative Trait Loci (QTL) in Heterogenous Stocks (HS). An HS is
  an advanced intercross between (usually eight) founder inbred strains
  of mice. HS are suitable for fine-mapping QTL.  It uses a multipoint