From b4ab64e5f3f0dbd66bb58f51fe366a26e3f18fe8 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date: Thu, 14 May 2015 23:42:11 +0200
Subject: [PATCH] prepare the 1.6.3 release

---
 README.txt        | 8 ++++++--
 ccminer.cpp       | 2 ++
 configure.ac      | 2 +-
 cpuminer-config.h | 6 +++---
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/README.txt b/README.txt
index ce67ef0..4156fe3 100644
--- a/README.txt
+++ b/README.txt
@@ -1,5 +1,5 @@
 
-ccMiner release 1.6.3-tpruvot (May 2015) - "Neoscrypt"
+ccMiner release 1.6.3-tpruvot (May 2015) - "Neoscrypt (SM5.0+)"
 ---------------------------------------------------------------
 
 ***************************************************************
@@ -130,6 +130,9 @@ its command line interface and options.
   -P, --protocol-dump   verbose dump of protocol-level activities
   -b, --api-bind        IP/Port for the miner API (default: 127.0.0.1:4068)
       --api-remote      Allow remote control
+      --max-temp=N      Only mine if gpu temp is less than specified value
+      --max-rate=N[KMG] Only mine if net hashrate is less than specified value
+      --max-diff=N      Only mine if net difficulty is less than specified value
   -B, --background      run the miner in the background
       --benchmark       run in offline benchmark mode
       --cputest         debug hashes from cpu algorithms
@@ -213,8 +216,9 @@ features.
 
 >>> RELEASE HISTORY <<<
 
-  Not released!!  v1.6.3
+  May 15th 2015   v1.6.3
                   Import and adapt Neoscrypt from djm34 work (SM 5+ only)
+                  Conditional mining options based on gpu temp, network diff and rate
                   background option implementation for windows too
                   "Multithreaded" devices (-d 0,0) intensity and stats changes
                   SM5+ Optimisation of skein based on sp/klaus method (+20%)
diff --git a/ccminer.cpp b/ccminer.cpp
index b3b0321..bad7f78 100644
--- a/ccminer.cpp
+++ b/ccminer.cpp
@@ -262,6 +262,8 @@ struct option {
 };
 #endif
 
+#define ADVANCED_HELP
+
 static char const usage[] = "\
 Usage: " PROGRAM_NAME " [OPTIONS]\n\
 Options:\n\
diff --git a/configure.ac b/configure.ac
index e91f7e2..2f69d1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([ccminer], [1.6.3-git])
+AC_INIT([ccminer], [1.6.3])
 
 AC_PREREQ([2.59c])
 AC_CANONICAL_SYSTEM
diff --git a/cpuminer-config.h b/cpuminer-config.h
index 9585259..1c9e55c 100644
--- a/cpuminer-config.h
+++ b/cpuminer-config.h
@@ -159,7 +159,7 @@
 #define PACKAGE_NAME "ccminer"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "ccminer 1.6.3-git"
+#define PACKAGE_STRING "ccminer 1.6.3"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "ccminer"
@@ -168,7 +168,7 @@
 #define PACKAGE_URL "http://github.com/tpruvot/ccminer"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.6.3-git"
+#define PACKAGE_VERSION "1.6.3"
 
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
@@ -182,7 +182,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.6.3-git"
+#define VERSION "1.6.3"
 
 /* Define curl_free() as free() if our version of curl lacks curl_free. */
 /* #undef curl_free */