Browse code

resync with stuff moving from IRanges to S4Vectors

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/CNEr@89247 bc3139a8-67e5-0310-9ffc-ced21a209358

Herve Pages authored on 19/04/2014 17:58:31
Showing 5 changed files

... ...
@@ -1,14 +1,14 @@
1 1
 Package: CNEr 
2
-Version: 1.1.0
2
+Version: 1.1.1
3 3
 Date: 2014-03-12
4 4
 Title: CNE detection and visualization.
5 5
 Description: Large-scale identification and advanced visualization of sets of conserved noncoding elements.
6 6
 Author: Ge Tan <ge.tan09@imperial.ac.uk> 
7 7
 Maintainer: Ge Tan <ge.tan09@imperial.ac.uk>
8
-Imports: Biostrings(>= 2.26.3), RSQLite(>= 0.11.4), GenomicRanges(>= 1.12.5), rtracklayer(>= 1.20.4), XVector(>= 0.2.0), DBI(>= 0.2-7), GenomicAlignments(>= 0.99.17), methods, IRanges(>= 1.19.38)
8
+Imports: Biostrings(>= 2.33.3), RSQLite(>= 0.11.4), GenomicRanges(>= 1.17.7), rtracklayer(>= 1.25.2), XVector(>= 0.5.3), DBI(>= 0.2-7), GenomicAlignments(>= 1.1.4), methods, S4Vectors(>= 0.0.1), IRanges(>= 1.99.1)
9 9
 Depends: R (>= 3.0.2)
10 10
 Suggests: Gviz(>= 1.7.4), RUnit, BiocGenerics
11
-LinkingTo: IRanges, XVector
11
+LinkingTo: S4Vectors, IRanges, XVector
12 12
 System Requirements: blat
13 13
 License: GPL-2 | file LICENSE
14 14
 License_restricts_use: yes
... ...
@@ -3,6 +3,7 @@ useDynLib(CNEr, .registration = TRUE)
3 3
 ### -----------------------------------------------------------------
4 4
 ### Import
5 5
 ### -----------------------------------------------------------------
6
+import(S4Vectors)
6 7
 import(IRanges)
7 8
 
8 9
 ### -----------------------------------------------------------------
... ...
@@ -9,6 +9,7 @@
9 9
 #include "Rdefines.h"
10 10
 #include "Rinternals.h"
11 11
 #include <string.h>
12
+#include "S4Vectors_interface.h"
12 13
 #include "IRanges_interface.h"
13 14
 #include "ucsc/binRange.h"
14 15
 #include "XVector_interface.h"
... ...
@@ -1,5 +1,6 @@
1 1
 PKG_OBJECTS = \
2
-  IRanges_stubs.o XVector_stubs.o R_init_CNEr.o utils.o io.o ceScan.o
2
+  S4Vectors_stubs.o IRanges_stubs.o XVector_stubs.o R_init_CNEr.o \
3
+  utils.o io.o ceScan.o
3 4
 
4 5
 UCSC_OBJECTS = \
5 6
   axt.o base64.o binRange.o bits.o chain.o \
6 7
new file mode 100644
... ...
@@ -0,0 +1 @@
1
+#include "_S4Vectors_stubs.c"