From bab90f50d51348c1120d4386d728fb2f645e3fdb Mon Sep 17 00:00:00 2001
From: Arlin Davis <arlin.r.davis@intel.com>
Date: Tue, 24 Nov 2009 11:01:16 -0800
Subject: [PATCH] Release 1.2.15

Signed-off-by: Arlin Davis <arlin.r.davis@intel.com>
---
 ChangeLog                       | 24 ++++++++++++++++++++++++
 Makefile.am                     |  2 +-
 configure.in                    |  4 ++--
 man/{dapltest.1 => dapltest1.1} |  0
 man/{dtest.1 => dtest1.1}       |  0
 5 files changed, 27 insertions(+), 3 deletions(-)
 rename man/{dapltest.1 => dapltest1.1} (100%)
 rename man/{dtest.1 => dtest1.1} (100%)

diff --git a/ChangeLog b/ChangeLog
index 709889d..971cf11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+commit bc36aedeb2b4bde89e7797ff13e6764f3f024b21
+Author: Arlin Davis <arlin.r.davis@intel.com>
+Date:   Tue Nov 24 11:00:04 2009 -0800
+
+    dtest, dapltest: conflict with dapl-2 utils package, change to dapl1, dapltest1
+    
+    Signed-off-by: Arlin Davis <arlin.r.davis@intel.com>
+
+commit 5bffc073ec56291cdfbdf91f42ef02c08232036a
+Author: Arlin Davis <arlin.r.davis@intel.com>
+Date:   Tue Nov 24 10:57:31 2009 -0800
+
+    scm: fix compiler warning, unused variable
+    
+    Signed-off-by: Arlin Davis <arlin.r.davis@intel.com>
+
+commit 06e497e4c68641f4e32d11f32d6fba68ecfb31f5
+Author: Arlin Davis <arlin.r.davis@intel.com>
+Date:   Tue Mar 31 05:43:23 2009 -0800
+
+    Release 1.2.14
+    
+    Signed-off-by: Arlin Davis <ardavis@ichips.intel.com>
+
 commit b2c945de6910fb35cf0aed0c305907984bb7b36f
 Author: Arlin Davis <arlin.r.davis@intel.com>
 Date:   Tue Mar 31 05:21:59 2009 -0800
diff --git a/Makefile.am b/Makefile.am
index ace6665..9c236e1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -303,7 +303,7 @@ libdatinclude_HEADERS = dat/include/dat/dat.h \
 			dat/include/dat/udat_redirection.h \
 			dat/include/dat/udat_vendor_specific.h 
 		
-man_MANS = man/dtest.1 man/dapltest.1 man/dat.conf.5 
+man_MANS = man/dtest1.1 man/dapltest1.1 man/dat.conf.5 
     	
 EXTRA_DIST = dat/common/dat_dictionary.h \
 	     dat/common/dat_dr.h \
diff --git a/configure.in b/configure.in
index 5d53416..4d25e60 100644
--- a/configure.in
+++ b/configure.in
@@ -1,11 +1,11 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(compat-dapl, 1.2.14 general@lists.openfabrics.org)
+AC_INIT(compat-dapl, 1.2.15 general@lists.openfabrics.org)
 AC_CONFIG_SRCDIR([dat/udat/udat.c])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(compat-dapl, 1.2.14)
+AM_INIT_AUTOMAKE(compat-dapl, 1.2.15)
 
 AM_PROG_LIBTOOL
 
diff --git a/man/dapltest.1 b/man/dapltest1.1
similarity index 100%
rename from man/dapltest.1
rename to man/dapltest1.1
diff --git a/man/dtest.1 b/man/dtest1.1
similarity index 100%
rename from man/dtest.1
rename to man/dtest1.1
-- 
2.41.0