Towards 1.3.36

diff --git a/Makefile.am b/Makefile.am
index c12418d..ba7d72e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.14.2.1 2005-01-16 20:19:03 adam Exp $
+## $Id: Makefile.am,v 1.14.2.2 2006-06-07 07:43:47 adam Exp $
 
 AUTOMAKE_OPTIONS=foreign
 
@@ -10,6 +10,7 @@ SPEC_FILE=$(PACKAGE).spec
 EXTRA_DIST= README NEWS $(SPEC_FILE) idzebra.spec.in
 
 dist-hook:
+       if test -x /usr/bin/cvs2cl -a -d CVS; then cvs2cl -F ZEBRA_1_3_16_branch; fi
        cp $(srcdir)/LICENSE* $(distdir)
        mkdir $(distdir)/win
        for i in $(srcdir)/win/*; do \
@@ -30,5 +31,3 @@ dist-hook:
                cd $(srcdir)/perl;cp --parents $$f $$pdir); \
        done
 
-cvs2cl:
-       cvs2cl -F ZEBRA_1_3_16_branch

diff --git a/NEWS b/NEWS
index 758124f..b0d492e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+--- 1.3.36 2006/06/07
+
+Fixed bug #602: Any extra terms appended to a wordlist with a hitcount
+of 0, gets incorrect term count
+
 Fixed bug #597: Support null missing key for sort.
 
 --- 1.3.34 2006/02/23

diff --git a/configure.in b/configure.in
index 6d7c606..a5b1f94 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 dnl Zebra, Index Data Aps, 1995-2005
-dnl $Id: configure.in,v 1.91.2.22 2006-04-04 09:18:53 adam Exp $
+dnl $Id: configure.in,v 1.91.2.23 2006-06-07 07:43:47 adam Exp $
 dnl
 AC_INIT(include/zebraver.h)
-AM_INIT_AUTOMAKE(idzebra,1.3.35)
+AM_INIT_AUTOMAKE(idzebra,1.3.36)
 dnl ------ Substitutions
 AC_SUBST(TCL_INCLUDE)
 AC_SUBST(TCL_LIB)

diff --git a/debian/changelog b/debian/changelog
index ce050a2..74c54a4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+idzebra (1.3.36-1) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Wed,  7 Jun 2006 09:42:57 +0200
+
 idzebra (1.3.34-1) unstable; urgency=low
 
   * Upstream.

diff --git a/include/zebraver.h b/include/zebraver.h
index 5f9ba75..25a4fbf 100644 (file)
--- a/include/zebraver.h
+++ b/include/zebraver.h
@@ -1,5 +1,5 @@
-/* $Id: zebraver.h,v 1.38.2.13 2006-03-24 14:05:45 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005
+/* $Id: zebraver.h,v 1.38.2.14 2006-06-07 07:43:48 adam Exp $
+   Copyright (C) 1995-2006
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -21,9 +21,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 */
 
 #ifndef ZEBRAVER
-#define ZEBRAVER "1.3.35"
+#define ZEBRAVER "1.3.36"
 #endif
 
 #ifndef ZEBRADATE
-#define ZEBRADATE "$Date: 2006-03-24 14:05:45 $"
+#define ZEBRADATE "$Date: 2006-06-07 07:43:48 $"
 #endif

diff --git a/win/zebra.nsi b/win/zebra.nsi
index 21de4e0..4dc776c 100644 (file)
--- a/win/zebra.nsi
+++ b/win/zebra.nsi
@@ -1,6 +1,6 @@
-; $Id: zebra.nsi,v 1.20.2.17 2006-03-24 14:05:45 adam Exp $
+; $Id: zebra.nsi,v 1.20.2.18 2006-06-07 07:43:48 adam Exp $
 
-!define VERSION "1.3.35"
+!define VERSION "1.3.36"
 !define VS_RUNTIME_LOCATION "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin"
 
 !include "MUI.nsh"