From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 21 May 2007 12:18:25 +0000 (+0000)
Subject: Towards 3.0.4
X-Git-Tag: YAZ.3.0.4
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=9c75e92604fae1efd7137d085dd2281e7886345b;p=yaz-moved-to-github.git

Towards 3.0.4
---

diff --git a/NEWS b/NEWS
index db41f6e..6e30749 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+--- 3.0.4 2007/05/21
+
+Fixed bug in character set conversion of BER strings. Bug introduced
+in 3.0.0.
+
 --- 3.0.2 2007/05/08
 
 For OIDs use Odr_oid type everywhere, i.e. do not assume Odr_oid=int.
diff --git a/configure.ac b/configure.ac
index c8910c1..1457ade 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 dnl YAZ Toolkit, Index Data 1995-2007
 dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.79 2007-05-16 10:47:14 adam Exp $
+dnl $Id: configure.ac,v 1.80 2007-05-21 12:18:25 adam Exp $
 AC_PREREQ(2.59)
-AC_INIT([yaz],[3.0.3],[yaz-help@indexdata.dk])
+AC_INIT([yaz],[3.0.4],[yaz-help@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 f0e8a0d..a8be9a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+yaz (3.0.4-1) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 21 May 2007 14:16:11 +0200
+
 yaz (3.0.2-2) unstable; urgency=low
 
   * libyaz3-dev should conflict with libyaz2-dev.
diff --git a/debian/rules b/debian/rules
index e3b2082..dbcebd2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,7 +98,7 @@ binary-arch: build install
 	dh_fixperms
 #	dh_perl
 #	dh_python
-	dh_makeshlibs -V 'libyaz3 (>= 3.0.2)'
+	dh_makeshlibs -V 'libyaz3 (>= 3.0.4)'
 	dh_installdeb
 	dh_shlibdeps  -l debian/libyaz3/usr/lib
 	dh_gencontrol
diff --git a/include/yaz/yaz-version.h b/include/yaz/yaz-version.h
index 4cc4d34..4fcd588 100644
--- a/include/yaz/yaz-version.h
+++ b/include/yaz/yaz-version.h
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: yaz-version.h,v 1.124 2007-05-16 10:47:14 adam Exp $ */
+/* $Id: yaz-version.h,v 1.125 2007-05-21 12:18:26 adam Exp $ */
 /**
  * \file yaz-version.h
  * \brief Defines YAZ version.
@@ -33,8 +33,8 @@
 
 #include <yaz/yconfig.h>
 
-#define YAZ_VERSION "3.0.3"
-#define YAZ_VERSIONL 0x030003
+#define YAZ_VERSION "3.0.4"
+#define YAZ_VERSIONL 0x030004
 
 #define YAZ_DATE 1
 
diff --git a/win/yaz.nsi b/win/yaz.nsi
index 2f9c848..24f2211 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,6 +1,6 @@
-; $Id: yaz.nsi,v 1.109 2007-05-08 08:39:00 adam Exp $
+; $Id: yaz.nsi,v 1.110 2007-05-21 12:18:26 adam Exp $
 
-!define VERSION "3.0.2"
+!define VERSION "3.0.4"
 
 ; Microsoft runtime CRT
 ; VS 2003
diff --git a/win/yaz.rc b/win/yaz.rc
index b83a114..2c62ffc 100644
--- a/win/yaz.rc
+++ b/win/yaz.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO 
-  FILEVERSION 3,0,2,1
-  PRODUCTVERSION  3,0,2,1
+  FILEVERSION 3,0,4,1
+  PRODUCTVERSION  3,0,4,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
   FILEFLAGS 0x1L
@@ -20,14 +20,14 @@ VS_VERSION_INFO VERSIONINFO
             VALUE "Comments", "Z39.50/SRU Library\0"
             VALUE "CompanyName", "Index Data ApS\0"
             VALUE "FileDescription", "YAZ Library\0"
-            VALUE "FileVersion", "3, 0, 2, 1\0"
+            VALUE "FileVersion", "3, 0, 4, 1\0"
             VALUE "InternalName", "YAZ\0"
             VALUE "LegalCopyright", "Copyright © 1995-2007 Index Data ApS\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "yaz.rc\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "YAZ Toolkit\0"
-            VALUE "ProductVersion", "3, 0, 2, 1\0"
+            VALUE "ProductVersion", "3, 0, 4, 1\0"
             VALUE "SpecialBuild", "\0"
         END
  }