From 947cec98f066b45753b9fcc4da251659935900e1 Mon Sep 17 00:00:00 2001
From: Marc Cromme <marc@indexdata.dk>
Date: Thu, 20 Apr 2006 08:38:01 +0000
Subject: [PATCH] bumped version number to 2.1.18

---
 NEWS                      |    5 +++++
 TODO                      |    4 ++--
 configure.ac              |    4 ++--
 debian/changelog          |    6 ++++++
 include/yaz/yaz-version.h |    6 +++---
 win/yaz.nsi               |    4 ++--
 win/yaz.rc                |    8 ++++----
 7 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/NEWS b/NEWS
index 006a3bf..639819f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+--- 2.1.18 2006/04/20
+
+ASN.1 compiler 0.4: generates brief Doxygen file header for 
+generated .h/.c files. 
+
 --- 2.1.17 2006/04/20
 
 Utility yaz_iconv now supports conversion to MARC-8.
diff --git a/TODO b/TODO
index af121a6..178fd0a 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,7 @@
-YAZ TODO $Id: TODO,v 1.12 2004-09-30 11:23:25 adam Exp $
+YAZ TODO $Id: TODO,v 1.13 2006-04-20 08:38:01 marc Exp $
 
 Versions to be put automatically in
-   configure.in
+   configure.ac
    include/yaz/yaz-version.h
    debian/changelog
    NEWS
diff --git a/configure.ac b/configure.ac
index 482e0bf..64e693a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 dnl YAZ Toolkit, Index Data 1994-2006
 dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.6 2006-03-31 12:49:37 adam Exp $
+dnl $Id: configure.ac,v 1.7 2006-04-20 08:38:01 marc Exp $
 AC_PREREQ(2.59)
-AC_INIT([yaz],[2.1.17],[adam@indexdata.dk])
+AC_INIT([yaz],[2.1.18],[adam@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([1.8])
diff --git a/debian/changelog b/debian/changelog
index 154d339..b7ce43c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+yaz (2.1.18-1) unstable; urgency=low
+
+  * Upstream.
+
+ -- Marc Cromme <marc@indexdata.dk>  Thu, 20 Apr 2006 10:43:56 +0200
+
 yaz (2.1.17-1) unstable; urgency=low
 
   * Upstream.
diff --git a/include/yaz/yaz-version.h b/include/yaz/yaz-version.h
index e3ec3e5..4c57509 100644
--- a/include/yaz/yaz-version.h
+++ b/include/yaz/yaz-version.h
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2006, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: yaz-version.h,v 1.79 2006-03-31 12:49:44 adam Exp $
+ * $Id: yaz-version.h,v 1.80 2006-04-20 08:38:01 marc Exp $
  */
 
 /**
@@ -13,8 +13,8 @@
 
 #include <yaz/yconfig.h>
 
-#define YAZ_VERSION "2.1.17"
-#define YAZ_VERSIONL 0x020111
+#define YAZ_VERSION "2.1.18"
+#define YAZ_VERSIONL 0x020112
 
 #define YAZ_DATE 1
 
diff --git a/win/yaz.nsi b/win/yaz.nsi
index b0fbd52..c8291fd 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,6 +1,6 @@
-; $Id: yaz.nsi,v 1.78 2006-03-31 12:49:44 adam Exp $
+; $Id: yaz.nsi,v 1.79 2006-04-20 08:38:01 marc Exp $
 
-!define VERSION "2.1.17"
+!define VERSION "2.1.18"
 !define VS_RUNTIME_LOCATION "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin"
 
 !include "MUI.nsh"
diff --git a/win/yaz.rc b/win/yaz.rc
index 417f774..8886247 100644
--- a/win/yaz.rc
+++ b/win/yaz.rc
@@ -54,8 +54,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,17,1
- PRODUCTVERSION 2,1,17,1
+ FILEVERSION 2,1,18,1
+ PRODUCTVERSION 2,1,18,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -73,14 +73,14 @@ BEGIN
             VALUE "Comments", "Z39.50 C Library\0"
             VALUE "CompanyName", "Index Data\0"
             VALUE "FileDescription", "YAZ Toolkit\0"
-            VALUE "FileVersion", "2, 1, 17, 1\0"
+            VALUE "FileVersion", "2, 1, 18, 1\0"
             VALUE "InternalName", "YAZ\0"
             VALUE "LegalCopyright", "Copyright © 1995-2006 Index Data\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "yaz.rc\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Index Data YAZ Toolkit\0"
-            VALUE "ProductVersion", "2, 1, 17, 1\0"
+            VALUE "ProductVersion", "2, 1, 18, 1\0"
             VALUE "SpecialBuild", "\0"
         END
     END
-- 
1.7.10.4