# HG changeset patch
# User mas01cr
# Date 1191250743 0
# Node ID a1d462d592dd761044bb5e0a4ad3791b712881c2
# Parent  06922d63775256e2326f9b62ea12655738ee7349
Merge trunk changes -r94:95 onto audiodb-debian branch

(+ new debian/changelog version)

diff -r 06922d637752 -r a1d462d592dd audioDB.cpp
--- a/audioDB.cpp	Mon Oct 01 14:40:08 2007 +0000
+++ b/audioDB.cpp	Mon Oct 01 14:59:03 2007 +0000
@@ -2563,8 +2563,13 @@
   };
 
   const unsigned argc = 19;
-  audioDB(argc, (char* const*)argv, &adbQueryResult);
-  return SOAP_OK;
+  try {
+    audioDB(argc, (char* const*)argv, &adbQueryResult);
+    return SOAP_OK;
+  } catch (char *err) {
+    soap_receiver_fault(soap, err, "");
+    return SOAP_FAULT;
+  }
 }
 
 int main(const unsigned argc, char* const argv[]){
diff -r 06922d637752 -r a1d462d592dd debian/changelog
--- a/debian/changelog	Mon Oct 01 14:40:08 2007 +0000
+++ b/debian/changelog	Mon Oct 01 14:59:03 2007 +0000
@@ -1,3 +1,9 @@
+audiodb (1.0-8) unstable; urgency=low
+
+  * updated to svn version #95
+
+ -- Christophe Rhodes <c.rhodes@gold.ac.uk>  Mon,  1 Oct 2007 16:56:06 +0100
+
 audiodb (1.0-7) unstable; urgency=low
 
   * updated to svn version #93