[med-svn] [SCM] cufflinks branch, master, updated. upstream/1.2.1-45-g4940099
Alexandre Mestiashvili
alex at biotec.tu-dresden.de
Sat Dec 10 11:20:50 UTC 2011
The following commit has been merged in the master branch:
commit 49400999a87b2d31ed7efaa92348896220c40a79
Author: Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
Date: Sat Dec 10 12:02:22 2011 +0100
Fixed spelling errors, reordered patches
diff --git a/debian/patches/0001-fix_spelling.patch b/debian/patches/0001-fix_spelling.patch
new file mode 100644
index 0000000..79af4f2
--- /dev/null
+++ b/debian/patches/0001-fix_spelling.patch
@@ -0,0 +1,36 @@
+From: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+Date: Sat, 10 Dec 2011 12:02:53 +0100
+Subject: fix_spelling
+
+---
+ src/locfit/arith.c | 2 +-
+ src/locfit/lfd.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/locfit/arith.c b/src/locfit/arith.c
+index 536a78c..2a6c66c 100644
+--- a/src/locfit/arith.c
++++ b/src/locfit/arith.c
+@@ -410,7 +410,7 @@ double (*f)();
+ INT i;
+ if (l==NULL)
+ {
+- ERROR(("vvec1 recieved NULL variable\n"));
++ ERROR(("vvec1 received NULL variable\n"));
+ return NULL;
+ }
+ v = createvar("_vvec1",STHIDDEN,l->n,VDOUBLE);
+diff --git a/src/locfit/lfd.c b/src/locfit/lfd.c
+index 4a6b74b..912670a 100644
+--- a/src/locfit/lfd.c
++++ b/src/locfit/lfd.c
+@@ -78,7 +78,7 @@ INT fp;
+ }
+ }
+ if (access("LFData",W_OK)==-1)
+- { ERROR(("LFData directory not writeable"));
++ { ERROR(("LFData directory not writable"));
+ return(0);
+ }
+ }
+--
diff --git a/debian/patches/0001-bam2samtools.patch b/debian/patches/0002-bam2samtools.patch
similarity index 99%
rename from debian/patches/0001-bam2samtools.patch
rename to debian/patches/0002-bam2samtools.patch
index 884d2e2..1270a71 100644
--- a/debian/patches/0001-bam2samtools.patch
+++ b/debian/patches/0002-bam2samtools.patch
@@ -19,3 +19,4 @@ index 7d463b7..8641172 100644
]], [[
]])],[
AC_MSG_RESULT(yes)
+--
diff --git a/debian/patches/0002-fix_includes_path.patch b/debian/patches/0003-fix_includes_path.patch
similarity index 100%
rename from debian/patches/0002-fix_includes_path.patch
rename to debian/patches/0003-fix_includes_path.patch
diff --git a/debian/patches/series b/debian/patches/series
index bf40253..8ceb241 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
-0001-bam2samtools.patch
-0002-fix_includes_path.patch
+0001-fix_spelling.patch
+0002-bam2samtools.patch
+0003-fix_includes_path.patch
--
Transcript assembly, differential expression, and differential regulation for RNA-Seq.
More information about the debian-med-commit
mailing list