From 62fdf8eaed7883c63e28b60c1a4cb8adee5e534d Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 6 Oct 2005 12:56:13 +0000
Subject: [PATCH] we all the next version 7.15.0 due to the new TFTP support

---
 RELEASE-NOTES          |  5 +++--
 include/curl/curlver.h | 29 ++++++++++++++++-------------
 maketgz                |  1 -
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 14a05648a..1a3b9b8e2 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,4 +1,4 @@
-Curl and libcurl 7.14.2
+Curl and libcurl 7.15.0
 
  Public curl release number:               90
  Releases counted from the very beginning: 117
@@ -16,6 +16,7 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
+ o -z over FTP now considers equal timestamps "not modified since"
  o Weird characters removed from the configure script
  o Fixed time zone offsets for MEST and CEST for the time parser
  o HTTP Content-Range header parser crash
@@ -39,6 +40,6 @@ This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
  o John Kelly, Nicolas François, Scott Davis, Ben Madsen, Dmitry Bartsevich,
-   David Yan, Michael Wallner, Domenico Andreoli
+   David Yan, Michael Wallner, Domenico Andreoli, Darryl House
 
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/include/curl/curlver.h b/include/curl/curlver.h
index 9da18b1b6..d543cb9af 100644
--- a/include/curl/curlver.h
+++ b/include/curl/curlver.h
@@ -28,7 +28,13 @@
 
 /* This is the version number of the libcurl package from which this header
    file origins: */
-#define LIBCURL_VERSION "7.14.2-CVS"
+#define LIBCURL_VERSION "7.15.0-CVS"
+
+/* The numeric version number is also available "in parts" by using these
+   defines: */
+#define LIBCURL_VERSION_MAJOR 7
+#define LIBCURL_VERSION_MINOR 15
+#define LIBCURL_VERSION_PATCH 0
 
 /* This is the numeric version of the libcurl version number, meant for easier
    parsing and comparions by programs. The LIBCURL_VERSION_NUM define will
@@ -37,19 +43,16 @@
          0xXXYYZZ
 
    Where XX, YY and ZZ are the main version, release and patch numbers in
-   hexadecimal. All three numbers are always represented using two digits.  1.2
-   would appear as "0x010200" while version 9.11.7 appears as "0x090b07".
+   hexadecimal (using 8 bits each). All three numbers are always represented
+   using two digits.  1.2 would appear as "0x010200" while version 9.11.7
+   appears as "0x090b07".
 
-   This 6-digit hexadecimal number does not show pre-release number, and it is
-   always a greater number in a more recent release. It makes comparisons with
-   greater than and less than work.
+   This 6-digit (24 bits) hexadecimal number does not show pre-release number,
+   and it is always a greater number in a more recent release. It makes
+   comparisons with greater than and less than work.
 */
-#define LIBCURL_VERSION_NUM 0x070e02
-
-/* The numeric version number is also available "in parts" by using these
-   defines: */
-#define LIBCURL_VERSION_MAJOR 7
-#define LIBCURL_VERSION_MINOR 14
-#define LIBCURL_VERSION_PATCH 2
+#define LIBCURL_VERSION_NUM ((LIBCURL_VERSION_MAJOR << 16) | \
+                             (LIBCURL_VERSION_MINOR << 8) | \
+                             LIBCURL_VERSION_PATCH)
 
 #endif /* __CURL_CURLVER_H */
diff --git a/maketgz b/maketgz
index 4941f8833..91ac4c444 100755
--- a/maketgz
+++ b/maketgz
@@ -25,7 +25,6 @@ CHEADER=src/version.h
 
 # Replace version number in header file:
 sed -e 's/^#define LIBCURL_VERSION .*/#define LIBCURL_VERSION "'$libversion'"/g' \
-    -e 's/^#define LIBCURL_VERSION_NUM .*/#define LIBCURL_VERSION_NUM 0x'$numeric'/g' \
     -e 's/^#define LIBCURL_VERSION_MAJOR .*/#define LIBCURL_VERSION_MAJOR '$major'/g' \
     -e 's/^#define LIBCURL_VERSION_MINOR .*/#define LIBCURL_VERSION_MINOR '$minor'/g' \
     -e 's/^#define LIBCURL_VERSION_PATCH .*/#define LIBCURL_VERSION_PATCH '$patch'/g' \