Release samtools-0.1.5a (for compatibility with Bio::DB::Sam)

diff --git a/Makefile b/Makefile
index 07f69df46bbd4281a96669467f4351a776f1b3c4..7bb44694e0ab26f8266bdadddb25075159b8b365 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,9 @@ CFLAGS=         -g -Wall -O2 #-m64 #-arch ppc
 CXXFLAGS=      $(CFLAGS)
 DFLAGS=                -D_FILE_OFFSET_BITS=64 -D_USE_KNETFILE #-D_NO_CURSES
 LOBJS=         bgzf.o kstring.o bam_aux.o bam.o bam_import.o sam.o bam_index.o \
-                       bam_pileup.o bam_lpileup.o bam_md.o glf.o razf.o faidx.o knetfile.o
-AOBJS=         bam_sort.o bam_tview.o bam_maqcns.o bam_plcmd.o sam_view.o      \
+                       bam_pileup.o bam_lpileup.o bam_md.o glf.o razf.o faidx.o knetfile.o     \
+                       bam_sort.o
+AOBJS=         bam_tview.o bam_maqcns.o bam_plcmd.o sam_view.o \
                        bam_rmdup.o bam_rmdupse.o bam_mate.o bam_stat.o bam_color.o     \
                        bamtk.o
 PROG=          samtools

diff --git a/bam.h b/bam.h
index a2ceb170e18e6ce135d126ef6111f7eccb54620e..83c03ada21098eda911caabb0e56db3864599e73 100644 (file)
--- a/bam.h
+++ b/bam.h
@@ -624,7 +624,7 @@ extern "C" {
 
        void bam_aux_append(bam1_t *b, const char tag[2], char type, int len, uint8_t *data);
 
-       // uint8_t *bam_aux_get_core(bam1_t *b, const char tag[2]); // an alias of bam_aux_get()
+       uint8_t *bam_aux_get_core(bam1_t *b, const char tag[2]); // an alias of bam_aux_get()
 
        /*!  
          @abstract Calculate the rightmost coordinate of an alignment on the

diff --git a/bam_aux.c b/bam_aux.c
index 640004d9baf340465fdb1df1c2045464b6f82eda..7482500ef08a53f3471858793112d9c72263e33a 100644 (file)
--- a/bam_aux.c
+++ b/bam_aux.c
@@ -19,12 +19,12 @@ void bam_aux_append(bam1_t *b, const char tag[2], char type, int len, uint8_t *d
        b->data[ori_len + 2] = type;
        memcpy(b->data + ori_len + 3, data, len);
 }
-/*
+
 uint8_t *bam_aux_get_core(bam1_t *b, const char tag[2])
 {
        return bam_aux_get(b, tag);
 }
-*/
+
 uint8_t *bam_aux_get(const bam1_t *b, const char tag[2])
 {
        uint8_t *s;

diff --git a/bamtk.c b/bamtk.c
index 87b9c136c1c739493a9e4ce000fca0dcc6f60df5..a8fea4b4a74591a489d48562dc5f5eaa4671c42f 100644 (file)
--- a/bamtk.c
+++ b/bamtk.c
@@ -4,7 +4,7 @@
 #include "bam.h"
 
 #ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "0.1.5 (r373)"
+#define PACKAGE_VERSION "0.1.5a (r381)"
 #endif
 
 int bam_taf2baf(int argc, char *argv[]);