Towards 2.0.12

diff --git a/LICENSE b/LICENSE
index b6f924d..4e38cfb 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 1995-2005, Index Data.
+ * Copyright (c) 1995-2006, Index Data.

  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,
  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,

diff --git a/NEWS b/NEWS
index 2488b7d..80320e0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
---- NOT YET RELEASED
+--- 2.1.12 2006/02/01 

 
 Fixed bug in yaz_oi_update which uesd incorrect value for categoryValue.
 
 
 Fixed bug in yaz_oi_update which uesd incorrect value for categoryValue.
 

diff --git a/buildconf.sh b/buildconf.sh
index c9645af..8c0cf2f 100755 (executable)
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 #!/bin/sh

-# $Id: buildconf.sh,v 1.22 2006-01-20 10:34:50 adam Exp $
+# $Id: buildconf.sh,v 1.23 2006-02-01 20:11:22 adam Exp $

 set -x
 aclocal -I .
 libtoolize --automake --force 
 set -x
 aclocal -I .
 libtoolize --automake --force 

@@ -17,7 +17,7 @@ sh_flags=""
 conf_flags=""
 case $1 in
     -d)
 conf_flags=""
 case $1 in
     -d)

-       sh_flags="-g -Wall -ansi"
+       sh_flags="-g -Wall"

        enable_configure=true
        enable_help=false
        shift
        enable_configure=true
        enable_help=false
        shift

diff --git a/configure.in b/configure.in
index e05f27a..d81e3e5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
-dnl YAZ Toolkit, Index Data 1994-2005
+dnl YAZ Toolkit, Index Data 1994-2006

 dnl See the file LICENSE for details.
 dnl See the file LICENSE for details.

-dnl $Id: configure.in,v 1.189 2005-12-17 20:20:55 adam Exp $
+dnl $Id: configure.in,v 1.190 2006-02-01 20:11:22 adam Exp $

 AC_INIT(include/yaz/yaz-version.h)
 AC_INIT(include/yaz/yaz-version.h)

-AM_INIT_AUTOMAKE(yaz, 2.1.11)
+AM_INIT_AUTOMAKE(yaz, 2.1.12)

 AM_MAINTAINER_MODE
 dnl
 AC_SUBST(READLINE_LIBS)
 AM_MAINTAINER_MODE
 dnl
 AC_SUBST(READLINE_LIBS)

diff --git a/debian/changelog b/debian/changelog
index ded91fc..8657b8e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+yaz (2.1.12-1) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Wed,  1 Feb 2006 21:07:50 +0100
+

 yaz (2.1.10-2) unstable; urgency=low
 
   * updated number for new release cycle
 yaz (2.1.10-2) unstable; urgency=low
 
   * updated number for new release cycle

diff --git a/debian/rules b/debian/rules
index 854878c..a7c0009 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -104,7 +104,7 @@ binary-arch: build install
        dh_fixperms
 #      dh_perl
 #      dh_python
        dh_fixperms
 #      dh_perl
 #      dh_python

-       dh_makeshlibs -V 'libyaz (>= 2.1.9)'
+       dh_makeshlibs -V 'libyaz (>= 2.1.11)'

        dh_installdeb
        dh_shlibdeps  -l debian/libyaz/usr/lib
        dh_gencontrol
        dh_installdeb
        dh_shlibdeps  -l debian/libyaz/usr/lib
        dh_gencontrol

diff --git a/doc/entities.ent b/doc/entities.ent
index c13c0e6..74ff152 100644 (file)
--- a/doc/entities.ent
+++ b/doc/entities.ent
@@ -1,4 +1,4 @@
-<!-- $Id: entities.ent,v 1.1 2005-10-15 10:40:37 adam Exp $ -->
+<!-- $Id: entities.ent,v 1.2 2006-02-01 20:11:22 adam Exp $ -->

 <!ENTITY yaz "YAZ">
 <!ENTITY bookinfo SYSTEM "bookinfo.xml">
 <!ENTITY chap-introduction SYSTEM "introduction.xml">
 <!ENTITY yaz "YAZ">
 <!ENTITY bookinfo SYSTEM "bookinfo.xml">
 <!ENTITY chap-introduction SYSTEM "introduction.xml">

@@ -25,4 +25,4 @@
 <!ENTITY zoom "<acronym>ZOOM</acronym>">
 <!ENTITY gfs-synopsis-app "application">
 <!ENTITY reference-tools-cql-map "<xref linkend='tools.cql.map'/>">
 <!ENTITY zoom "<acronym>ZOOM</acronym>">
 <!ENTITY gfs-synopsis-app "application">
 <!ENTITY reference-tools-cql-map "<xref linkend='tools.cql.map'/>">

-<!ENTITY copyright-year "1995-2005">
+<!ENTITY copyright-year "1995-2006">

diff --git a/include/yaz/yaz-version.h b/include/yaz/yaz-version.h
index d8567a7..14b7ab3 100644 (file)
--- a/include/yaz/yaz-version.h
+++ b/include/yaz/yaz-version.h
@@ -1,8 +1,8 @@
 /*
 /*

- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2006, Index Data ApS

  * See the file LICENSE for details.
  *
  * See the file LICENSE for details.
  *

- * $Id: yaz-version.h,v 1.73 2005-11-29 20:17:09 adam Exp $
+ * $Id: yaz-version.h,v 1.74 2006-02-01 20:11:22 adam Exp $

  */
 
 /**
  */
 
 /**

@@ -13,8 +13,8 @@
 
 #include <yaz/yconfig.h>
 
 
 #include <yaz/yconfig.h>
 

-#define YAZ_VERSION "2.1.10"
-#define YAZ_VERSIONL 0x02010A
+#define YAZ_VERSION "2.1.12"
+#define YAZ_VERSIONL 0x02010C

 
 #define YAZ_DATE 1
 
 
 #define YAZ_DATE 1
 

diff --git a/win/LICENSE.txt b/win/LICENSE.txt
index e02d78d..dac477a 100644 (file)
--- a/win/LICENSE.txt
+++ b/win/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 1995-2005, Index Data.
+Copyright (c) 1995-2006, Index Data.

 
 Permission to use, copy, modify, distribute, and sell this software and its documentation, in whole or in part, for any purpose, is hereby granted, provided that:
 
 
 Permission to use, copy, modify, distribute, and sell this software and its documentation, in whole or in part, for any purpose, is hereby granted, provided that:
 

diff --git a/win/yaz.nsi b/win/yaz.nsi
index c7ecaef..0850346 100644 (file)
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,6 +1,6 @@
-; $Id: yaz.nsi,v 1.71 2005-11-29 20:26:06 adam Exp $
+; $Id: yaz.nsi,v 1.72 2006-02-01 20:11:22 adam Exp $

 
 

-!define VERSION "2.1.10"
+!define VERSION "2.1.12"

 !define VS_RUNTIME_LOCATION "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin"
 
 !include "MUI.nsh"
 !define VS_RUNTIME_LOCATION "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin"
 
 !include "MUI.nsh"

@@ -121,6 +121,7 @@ Section "YAZ Documentation" YAZ_Documentation
        File ..\doc\*.dsl
        File ..\doc\*.xsl
        File ..\doc\*.css
        File ..\doc\*.dsl
        File ..\doc\*.xsl
        File ..\doc\*.css

+       File ..\doc\*.ent

        SetOutPath $SMPROGRAMS\YAZ
        CreateShortCut "$SMPROGRAMS\YAZ\HTML Documentation.lnk" \
                  "$INSTDIR\doc\yaz.html"
        SetOutPath $SMPROGRAMS\YAZ
        CreateShortCut "$SMPROGRAMS\YAZ\HTML Documentation.lnk" \
                  "$INSTDIR\doc\yaz.html"

diff --git a/win/yaz.rc b/win/yaz.rc
index e156715..88237dd 100644 (file)
--- a/win/yaz.rc
+++ b/win/yaz.rc
@@ -54,8 +54,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
 //
 
 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 2,1,10,1
- PRODUCTVERSION 2,1,10,1
+ FILEVERSION 2,1,12,1
+ PRODUCTVERSION 2,1,12,1

  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
  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 "Comments", "Z39.50 C Library\0"
             VALUE "CompanyName", "Index Data\0"
             VALUE "FileDescription", "YAZ Toolkit\0"

-            VALUE "FileVersion", "2, 1, 10, 1\0"
+            VALUE "FileVersion", "2, 1, 12, 1\0"

             VALUE "InternalName", "YAZ\0"
             VALUE "InternalName", "YAZ\0"

-            VALUE "LegalCopyright", "Copyright © 1995-2005 Index Data\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 "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "yaz.rc\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Index Data YAZ Toolkit\0"

-            VALUE "ProductVersion", "2, 1, 10, 1\0"
+            VALUE "ProductVersion", "2, 1, 12, 1\0"

             VALUE "SpecialBuild", "\0"
         END
     END
             VALUE "SpecialBuild", "\0"
         END
     END