Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

diff --git a/configure.ac b/configure.ac
index 2908aea..488bed8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 
 # Autoconf and automake setup
 AC_PREREQ(2.60)
-AC_INIT([pazpar2],[1.5.5],[pazpar2-help@indexdata.dk])
+AC_INIT([pazpar2],[1.5.6],[pazpar2-help@indexdata.dk])
 
 AC_CONFIG_HEADERS(src/config.h)
 

diff --git a/debian/changelog b/debian/changelog
index 31f83d6..4cde1a3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pazpar2 (1.5.6-1indexdata) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 15 Apr 2011 11:42:25 +0000
+
 pazpar2 (1.5.5-1indexdata) unstable; urgency=low
 
   * Upstream.

diff --git a/m4 b/m4
index f7d7eb4..96ff03f 160000 (submodule)
--- a/m4
+++ b/m4
@@ -1 +1 @@
-Subproject commit f7d7eb4b44b7fdad1942e32856d6afc2e6dcabda
+Subproject commit 96ff03f91b4539e315dadd50ab2564412c076394

diff --git a/pazpar2.spec b/pazpar2.spec
index 3cfafe2..796c4eb 100644 (file)
--- a/pazpar2.spec
+++ b/pazpar2.spec
@@ -1,6 +1,6 @@
 Summary: Metasearcher
 Name: pazpar2
-Version: 1.5.5
+Version: 1.5.6
 Release: 1indexdata
 License: GPL
 Group: Applications/Internet

diff --git a/rpm/pazpar2.init b/rpm/pazpar2.init
index da5d642..c57d9e4 100755 (executable)
--- a/rpm/pazpar2.init
+++ b/rpm/pazpar2.init
@@ -2,7 +2,7 @@
 #
 # pazpar2      Startup script for Pazpar2
 #
-# chkconfig: - 85 15
+# chkconfig: 2345 85 15
 # description: Pazpar2 Metasearcher
 # processname: pazpar2
 # config: /etc/pazpar2/server.xml

diff --git a/win/makefile b/win/makefile
index 869e779..4748a0a 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -4,7 +4,7 @@
 DEBUG=0   # 0 for release, 1 for debug
 USE_MANIFEST = 1 # Can be enabled Visual Studio 2005/2008
 PACKAGE_NAME=pazpar2
-PACKAGE_VERSION=1.5.5
+PACKAGE_VERSION=1.5.6
 
 # YAZ
 YAZ_DIR=..\..\yaz

diff --git a/www/jsdemo/example_client.js b/www/jsdemo/example_client.js
index fd9c37e..8342494 100644 (file)
--- a/www/jsdemo/example_client.js
+++ b/www/jsdemo/example_client.js
@@ -13,7 +13,7 @@ if (document.location.hash == '#useproxy') {
     showResponseType = 'json';
 }
 
-my_paz = new pz2( { "onshow": my_onshow,
+var my_paz = new pz2( { "onshow": my_onshow,
                     "showtime": 500,            //each timer (show, stat, term, bytarget) can be specified this way
                     "pazpar2path": pazpar2path,
                     "oninit": my_oninit,
@@ -245,7 +245,7 @@ function drawPager (pagerDiv)
 
     var prev = '<span id="prev">&#60;&#60; Prev</span><b> | </b>';
     if (curPage > 1)
-        var prev = '<a href="#" id="prev" onclick="pagerPrev();">'
+        prev = '<a href="#" id="prev" onclick="pagerPrev();">'
         +'&#60;&#60; Prev</a><b> | </b>';
 
     var middle = '';
@@ -260,14 +260,14 @@ function drawPager (pagerDiv)
     
     var next = '<b> | </b><span id="next">Next &#62;&#62;</span>';
     if (pages - curPage > 0)
-    var next = '<b> | </b><a href="#" id="next" onclick="pagerNext()">'
+        next = '<b> | </b><a href="#" id="next" onclick="pagerNext()">'
         +'Next &#62;&#62;</a>';
 
-    predots = '';
+    var predots = '';
     if (firstClkbl > 1)
         predots = '...';
 
-    postdots = '';
+    var postdots = '';
     if (lastClkbl < pages)
         postdots = '...';