From: Heng Li <lh3@live.co.uk>
Date: Tue, 7 Jul 2009 10:20:06 +0000 (+0000)
Subject: Release samtools-0.1.5a (for compatibility with Bio::DB::Sam)
X-Git-Url: https://git.donarmstrong.com/?p=samtools.git;a=commitdiff_plain;h=b276050eeeea3a0f85ff193410bcb81f5b7a588b

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

diff --git a/Makefile b/Makefile
index 07f69df..7bb4469 100644
--- 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 a2ceb17..83c03ad 100644
--- 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 640004d..7482500 100644
--- 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 87b9c13..a8fea4b 100644
--- 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[]);