Bump version to 1.2.4

diff --git a/NEWS b/NEWS
index 52d6fcb..f0af930 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,17 @@
---- 1.2.4 IN PROGRESS
+--- 1.2.4 2010/01/15
 
 Support for additional fields in cf.xsl and pazpar2.conf.dist:
 publisher, available, due, location (=locallocation), callno
 (=callnumber), thumburl and score.
 
+Describe pz:xslt and the auto setting.
+
+Move mergekey definition away from the normalization stylesheets and
+define a mergekey common for all target types in pazpar2.cfg.
+
+Code update: Use the Odr_int type for hit counts. This is part of
+YAZ 3.0.47 and later and so configure checks for that.
+
 --- 1.2.3 2009/11/24
 
 Metadata attribute 'skiparticle' also works for ICU based

diff --git a/configure.ac b/configure.ac
index 1f708b8..f7d9a62 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 
 # Autoconf and automake setup
 AC_PREREQ(2.60)
-AC_INIT([pazpar2],[1.2.3],[pazpar2-help@indexdata.dk])
+AC_INIT([pazpar2],[1.2.4],[pazpar2-help@indexdata.dk])
 
 AC_CONFIG_HEADERS(src/config.h)
 

diff --git a/debian/changelog b/debian/changelog
index b1204e3..674b809 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pazpar2 (1.2.4-1indexdata) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 15 Jan 2010 10:08:36 +0100
+
 pazpar2 (1.2.3-3indexdata) unstable; urgency=low
 
   * Upstream: another interrim package.