From e648fad9feddf0b92031567eaeba9222959928ce Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 20 Jun 2007 14:11:41 +0000
Subject: [PATCH] jsdemo included in distribution. It illustrates the use of
 the js/pz2.js JavaScript library. Added Debian package
 pazpar2-jsdemo .

---
 Makefile.am                |    9 ++++++---
 NEWS                       |    4 ++++
 debian/ap2jsdemo.cfg       |    4 ++++
 debian/control             |   13 ++++++++++++-
 debian/pazpar2-jsdemo.dirs |    2 ++
 debian/rules               |    7 +++++++
 6 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 debian/ap2jsdemo.cfg
 create mode 100644 debian/pazpar2-jsdemo.dirs

diff --git a/Makefile.am b/Makefile.am
index 832d907..41d7dbe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.12 2007-06-20 06:58:50 adam Exp $
+# $Id: Makefile.am,v 1.13 2007-06-20 14:11:41 adam Exp $
 
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4
@@ -11,11 +11,14 @@ dist-hook:
 	if test -x /usr/bin/cvs2cl -a -d CVS; then cvs2cl ; cp ChangeLog $(distdir); fi
 	cp -r $(srcdir)/etc $(distdir)
 	cvs=`find $(distdir)/etc -name CVS -type d -print`; if test "$$cvs"; then rm -r $$cvs; fi
-	mkdir $(distdir)/www
-	mkdir $(distdir)/www/test1
+	mkdir -p $(distdir)/www/test1
 	for f in $(srcdir)/www/test1/*; do \
 		test -f $$f && cp $$f $(distdir)/www/test1; \
 	done; exit 0
+	mkdir -p $(distdir)/www/jsdemo
+	for f in $(srcdir)/www/jsdemo/*; do \
+		test -f $$f && cp $$f $(distdir)/www/jsdemo; \
+	done; exit 0
 	mkdir $(distdir)/debian
 	for f in $(srcdir)/debian/*; do \
 		test -f $$f && cp $$f $(distdir)/debian; \
diff --git a/NEWS b/NEWS
index 3333ff2..35167ee 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+
+jsdemo included in distribution. It illustrates the use of the js/pz2.js
+JavaScript library.
+
 --- 1.0.0 2007/06/20
 
 First public release.
diff --git a/debian/ap2jsdemo.cfg b/debian/ap2jsdemo.cfg
new file mode 100644
index 0000000..4878bff
--- /dev/null
+++ b/debian/ap2jsdemo.cfg
@@ -0,0 +1,4 @@
+Alias /pazpar2-jsdemo /usr/share/pazpar2-jsdemo/
+
+ProxyPass /pazpar2-jsdemo/search.pz2 http://localhost:8004/search.pz2
+
diff --git a/debian/control b/debian/control
index 178a732..25ecdc6 100644
--- a/debian/control
+++ b/debian/control
@@ -46,6 +46,17 @@ Description: Pazpar2 portal test1
  model-independent metasearching middleware featuring merging, relevance
  ranking, record sorting, and faceted results.
  .
- This is a simple metasearch interface using Pazpar2 that us using
+ This is a simple metasearch interface using Pazpar2 that is using
  Apache2 as frontend HTTP server. When installed, this service is
  available at http://host/pazpar2-test1/ .
+
+Package: pazpar2-jsdemo
+Architecture: all
+Depends: pazpar2, pazpar2-apache2
+Description: Pazpar2 demo using the pz2.js library
+ Pazpar2 is a high-performance, user interface-independent, data
+ model-independent metasearching middleware featuring merging, relevance
+ ranking, record sorting, and faceted results.
+ .
+ This is a metasearch interface using Pazpar2 JavaScript library pz2.js
+ library. Is available at http://host/pazpar2-jsdemo/ .
diff --git a/debian/pazpar2-jsdemo.dirs b/debian/pazpar2-jsdemo.dirs
new file mode 100644
index 0000000..b09f3ea
--- /dev/null
+++ b/debian/pazpar2-jsdemo.dirs
@@ -0,0 +1,2 @@
+etc/apache2/conf.d
+usr/share/pazpar2-jsdemo
diff --git a/debian/rules b/debian/rules
index 24483bb..afc57d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,14 +75,21 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs NEWS
+	# pazpar2-doc package
 	mv $(CURDIR)/debian/pazpar2/usr/share/doc/pazpar2/* $(CURDIR)/debian/pazpar2-doc/usr/share/doc/pazpar2-doc
+	# pazpar2-apache2 package
 	cp $(CURDIR)/debian/pazpar2.cfg $(CURDIR)/debian/pazpar2/etc/pazpar2/
 	cp etc/*.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/settings/
 	cp etc/*.xsl $(CURDIR)/debian/pazpar2/etc/pazpar2/
 	cp $(CURDIR)/debian/ap2pazpar2.cfg $(CURDIR)/debian/pazpar2-apache2/etc/apache2/conf.d
+	# pazpar2-test1 package
 	cp www/test1/index.html $(CURDIR)/debian/pazpar2-test1/usr/share/pazpar2-test1/
 	cp www/test1/search.js $(CURDIR)/debian/pazpar2-test1/usr/share/pazpar2-test1/
 	cp $(CURDIR)/debian/ap2test1.cfg $(CURDIR)/debian/pazpar2-test1/etc/apache2/conf.d
+	# pazpar2-jsdemo package
+	cp www/jsdemo/*.html $(CURDIR)/debian/pazpar2-jsdemo/usr/share/pazpar2-jsdemo/
+	cp www/jsdemo/*.js $(CURDIR)/debian/pazpar2-jsdemo/usr/share/pazpar2-jsdemo/
+	cp $(CURDIR)/debian/ap2jsdemo.cfg $(CURDIR)/debian/pazpar2-jsdemo/etc/apache2/conf.d
 	dh_installchangelogs NEWS
 	dh_installdocs
 	dh_installexamples
-- 
1.7.10.4