[med-svn] r15849 - in trunk/packages/R/r-other-mott-happy/trunk/debian: . patches

[Steffen Möller]

Author: moeller
Date: 2014-01-24 16:40:40 +0000 (Fri, 24 Jan 2014)
New Revision: 15849

Removed:
   trunk/packages/R/r-other-mott-happy/trunk/debian/patches/ELT_String.patch
Modified:
   trunk/packages/R/r-other-mott-happy/trunk/debian/changelog
   trunk/packages/R/r-other-mott-happy/trunk/debian/control
   trunk/packages/R/r-other-mott-happy/trunk/debian/patches/series
   trunk/packages/R/r-other-mott-happy/trunk/debian/rules
Log:
New upstream version (2.4) of happy.


Modified: trunk/packages/R/r-other-mott-happy/trunk/debian/changelog
===================================================================
--- trunk/packages/R/r-other-mott-happy/trunk/debian/changelog	2014-01-24 12:18:03 UTC (rev 15848)
+++ trunk/packages/R/r-other-mott-happy/trunk/debian/changelog	2014-01-24 16:40:40 UTC (rev 15849)
@@ -1,3 +1,10 @@
+r-other-mott-happy (2.4-1) unstable; urgency=low
+
+  * New upstream version.
+  * Revived the debug package.
+
+ -- Steffen Moeller <moeller at debian.org>  Fri, 24 Jan 2014 15:48:04 +0100
+
 r-other-mott-happy (2.3-1) unstable; urgency=low
 
   * Team upload.

Modified: trunk/packages/R/r-other-mott-happy/trunk/debian/control
===================================================================
--- trunk/packages/R/r-other-mott-happy/trunk/debian/control	2014-01-24 12:18:03 UTC (rev 15848)
+++ trunk/packages/R/r-other-mott-happy/trunk/debian/control	2014-01-24 16:40:40 UTC (rev 15849)
@@ -10,7 +10,7 @@
                r-cran-g.data,
                r-cran-multicore,
                r-cran-mass
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/R/r-other-mott-happy/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/R/r-other-mott-happy/trunk/
 Homepage: http://www.well.ox.ac.uk/happy/happyR.shtml
@@ -25,7 +25,7 @@
 Recommends: r-cran-vr,
             r-cran-multicore
 Provides: r-other-mott-happy
-Conflicts: r-other-mott-happy
+Conflicts: r-other-mott-happy, r-other-mott-happy.hbrem-dbg (<< ${binary:Version})
 Replaces: r-other-mott-happy
 Description: GNU R package for fine-mapping complex diseases
  Happy is an R interface into the HAPPY C package for fine-mapping
@@ -44,3 +44,15 @@
  Read /usr/share/doc/r-other-mott-happy/README.Debian for a more
  detailed explanation.
 
+Package: r-other-mott-happy.hbrem-dbg
+Architecture: any
+Section: debug
+Depends: ${misc:Depends}, r-other-mott-happy.hbrem (= ${binary:Version})
+Description: Debug information for Happy R package native library
+ The documentation of Happy is fairly complete, but the runtime itself
+ does not inform as verbosely as users would like it on errors in
+ configuration files. This debug package may complement nicely the
+ on or other missing check on data integrity.
+ .
+ With this package installed, a debugger like 'gdb' indicates the
+ position in the C implementation of R routines that spawned an error.

Deleted: trunk/packages/R/r-other-mott-happy/trunk/debian/patches/ELT_String.patch
===================================================================
--- trunk/packages/R/r-other-mott-happy/trunk/debian/patches/ELT_String.patch	2014-01-24 12:18:03 UTC (rev 15848)
+++ trunk/packages/R/r-other-mott-happy/trunk/debian/patches/ELT_String.patch	2014-01-24 16:40:40 UTC (rev 15849)
@@ -1,34 +0,0 @@
-Index: r-other-mott-happy-2.3/src/Rhappy.c
-===================================================================
---- r-other-mott-happy-2.3.orig/src/Rhappy.c
-+++ r-other-mott-happy-2.3/src/Rhappy.c
-@@ -210,21 +210,21 @@
- 
-   
-   /*  SET_VECTOR_ELT(ans,0,strains);
--  SET_VECTOR_ELT(names,0,mkChar("strains"));
-+  SET_STRING_ELT(names,0,mkChar("strains"));
-   SET_VECTOR_ELT(ans,1,markers);
--  SET_VECTOR_ELT(names,1,mkChar("markers"));
-+  SET_STRING_ELT(names,1,mkChar("markers"));
-   SET_VECTOR_ELT(ans,2,map);
--  SET_VECTOR_ELT(names,2,mkChar("map"));
-+  SET_STRING_ELT(names,2,mkChar("map"));
-   SET_VECTOR_ELT(ans,3,subjects);
--  SET_VECTOR_ELT(names,3,mkChar("subjects"));
-+  SET_STRING_ELT(names,3,mkChar("subjects"));
-   SET_VECTOR_ELT(ans,4,phenotypes);
--  SET_VECTOR_ELT(names,4,mkChar("phenotypes"));
-+  SET_STRING_ELT(names,4,mkChar("phenotypes"));
-   SET_VECTOR_ELT(ans,5,handle);
--  SET_VECTOR_ELT(names,5,mkChar("handle"));
-+  SET_STRING_ELT(names,5,mkChar("handle"));
-   SET_VECTOR_ELT(ans,6,chromosome);
--  SET_VECTOR_ELT(names,6,mkChar("chromosome"));
-+  SET_STRING_ELT(names,6,mkChar("chromosome"));
-   SET_VECTOR_ELT(ans,7,family);
--  SET_VECTOR_ELT(names,7,mkChar("family"));
-+  SET_STRING_ELT(names,7,mkChar("family"));
-   */
-   SET_VECTOR_ELT(ans,0,strains);
-   SET_STRING_ELT(names,0,mkChar("strains"));

Modified: trunk/packages/R/r-other-mott-happy/trunk/debian/patches/series
===================================================================
--- trunk/packages/R/r-other-mott-happy/trunk/debian/patches/series	2014-01-24 12:18:03 UTC (rev 15848)
+++ trunk/packages/R/r-other-mott-happy/trunk/debian/patches/series	2014-01-24 16:40:40 UTC (rev 15849)
@@ -1,2 +1 @@
 happyMatrices.patch
-ELT_String.patch

Modified: trunk/packages/R/r-other-mott-happy/trunk/debian/rules
===================================================================
--- trunk/packages/R/r-other-mott-happy/trunk/debian/rules	2014-01-24 12:18:03 UTC (rev 15848)
+++ trunk/packages/R/r-other-mott-happy/trunk/debian/rules	2014-01-24 16:40:40 UTC (rev 15849)
@@ -9,6 +9,10 @@
 pre-build::
 	[ -f NAMESPACE ] || echo 'exportPattern("^[[:alpha:]]+")' > NAMESPACE
 
+override_dh_strip:
+	dh_strip -Pr-other-mott-happy.hbrem --dbg-package=r-other-mott-happy.hbrem-dbg
+
+
 override_dh_clean:
 	$(RM) NAMESPACE
 	dh_clean