Index: /trunk/psLib/pslib.kdevelop
===================================================================
--- /trunk/psLib/pslib.kdevelop	(revision 4876)
+++ /trunk/psLib/pslib.kdevelop	(revision 4877)
@@ -49,4 +49,9 @@
         <envvar value="1" name="WANT_AUTOMAKE_1_6" />
       </envvars>
+      <abortonerror>false</abortonerror>
+      <numberofjobs>2</numberofjobs>
+      <dontact>false</dontact>
+      <makebin/>
+      <prio>0</prio>
     </make>
   </kdevautoproject>
Index: /trunk/psLib/src/astro/psCoord.h
===================================================================
--- /trunk/psLib/src/astro/psCoord.h	(revision 4876)
+++ /trunk/psLib/src/astro/psCoord.h	(revision 4877)
@@ -10,6 +10,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-07-27 19:55:15 $
+*  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-08-25 23:42:01 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -162,10 +162,4 @@
 psCube* psCubeAlloc(void);
 
-/** Allocates a psCube
- *
- *  @return psCube*       resulting cube structure.
- */
-psCube* psCubeAlloc(void);
-
 /** Allocates a psPlaneTransform transform.
  *
Index: /trunk/psLib/src/psErrorText.h.in
===================================================================
--- /trunk/psLib/src/psErrorText.h.in	(revision 4876)
+++ /trunk/psLib/src/psErrorText.h.in	(revision 4877)
@@ -7,9 +7,11 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-12 19:12:00 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-25 23:41:59 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
+
+/* !!! DO NOT EDIT psErrorText.h!  Add error messages to the cooresponding .dat file !!! */
 
 #ifndef PS_ERROR_TEXT_H
Index: /trunk/psLib/src/sys/psMemory.c
===================================================================
--- /trunk/psLib/src/sys/psMemory.c	(revision 4876)
+++ /trunk/psLib/src/sys/psMemory.c	(revision 4877)
@@ -8,6 +8,6 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-07-21 01:40:10 $
+*  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-08-25 23:42:07 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -109,5 +109,5 @@
         psError(PS_ERR_MEMORY_CORRUPTION, false,
                 PS_ERRORTEXT_psMemory_MULTIPLE_FREE,
-                ptr->id, ptr->file, ptr->lineno, file, lineno);
+                (unsigned long)ptr->id, ptr->file, ptr->lineno, file, lineno);
     }
 
@@ -138,5 +138,5 @@
         psError(PS_ERR_MEMORY_CORRUPTION, true,
                 PS_ERRORTEXT_psMemory_DEREF_BLOCK_USE,
-                m->id);
+                (unsigned long)m->id);
         return 1;
     }
@@ -145,5 +145,5 @@
         psError(PS_ERR_MEMORY_CORRUPTION, true,
                 PS_ERRORTEXT_psMemory_UNDERFLOW,
-                m->id);
+                (unsigned long)m->id);
         return 1;
     }
@@ -151,5 +151,5 @@
         psError(PS_ERR_MEMORY_CORRUPTION, true,
                 PS_ERRORTEXT_psMemory_OVERFLOW,
-                m->id);
+                (unsigned long)m->id);
         return 1;
     }
@@ -390,6 +390,6 @@
         if (checkMemBlock(ptr, __func__) != 0) {
             memProblemCallback(ptr, file, lineno);
-            psAbort(file, "Realloc detected a memory corruption (id %lld @ %s:%d).",
-                    ptr->id, ptr->file, ptr->lineno);
+            psAbort(file, "Realloc detected a memory corruption (id %lu @ %s:%d).",
+                    (unsigned long)ptr->id, ptr->file, ptr->lineno);
         }
 
@@ -444,5 +444,5 @@
 
         psAbort(__func__,PS_ERRORTEXT_psMemory_MULTIPLE_FREE,
-                ptr->id, ptr->file, ptr->lineno, filename, lineno);
+                (unsigned long)ptr->id, ptr->file, ptr->lineno, filename, lineno);
     }
 
@@ -481,5 +481,5 @@
                 }
 
-                fprintf(fd, "   %20s:%-4d %ld\n", iter->file, (int)iter->lineno, (long)iter->id);
+                fprintf(fd, "   %20s:%-4d %lu\n", iter->file, (int)iter->lineno, (unsigned long)iter->id);
             }
         }
Index: /trunk/psLib/test/db/Makefile.am
===================================================================
--- /trunk/psLib/test/db/Makefile.am	(revision 4876)
+++ /trunk/psLib/test/db/Makefile.am	(revision 4877)
@@ -17,5 +17,19 @@
 EXTRA_DIST = verified
 
-CLEANFILES = $(TESTS) $(check_DATA)
+CLEANFILES = $(TESTS) $(check_DATA) 
+
+clean-local:
+	mysql test -e "drop table1" 2> /dev/null || \
+	mysql test -e "drop table2" 2> /dev/null || \
+	mysql test -e "drop table3" 2> /dev/null || \
+	mysql test -e "drop table4" 2> /dev/null || \
+	mysql test -e "drop table5" 2> /dev/null || \
+	mysql test -e "drop table6" 2> /dev/null || \
+	mysql test -e "drop table7" 2> /dev/null || \
+	mysql test -e "drop table8" 2> /dev/null || \
+	mysql test -e "drop table9" 2> /dev/null || \
+	mysql test -e "drop table10" 2> /dev/null || \
+	mysql test -e "drop table11" 2> /dev/null || \
+	true
 
 tests: $(check_DATA) $(TESTS)
Index: /trunk/psLib/test/imageops/verified/tst_psImagePixelManip.stderr
===================================================================
--- /trunk/psLib/test/imageops/verified/tst_psImagePixelManip.stderr	(revision 4876)
+++ /trunk/psLib/test/imageops/verified/tst_psImagePixelManip.stderr	(revision 4877)
@@ -27,4 +27,6 @@
 <DATE><TIME>|<HOST>|I|testImageClip
     Following should be an error (max<min)
+<DATE><TIME>|<HOST>|E|psImageClip (FILE:LINENO)
+    Specified min value, 256, can not be greater than the specified max value, 128.
 
 ---> TESTPOINT PASSED (psImage{psImageClip} | tst_psImagePixelManip.c)
Index: /trunk/psLib/test/sys/tst_psMemory.c
===================================================================
--- /trunk/psLib/test/sys/tst_psMemory.c	(revision 4876)
+++ /trunk/psLib/test/sys/tst_psMemory.c	(revision 4877)
@@ -6,6 +6,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-07-13 02:47:01 $
+*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-08-25 23:42:07 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -491,5 +491,5 @@
 void memProblemCallback( psMemBlock *ptr, const char *file, unsigned int lineno )
 {
-    psLogMsg( __func__, PS_LOG_INFO, "memory callback called for id %lld (%s:%d).",
+    psLogMsg( __func__, PS_LOG_INFO, "memory callback called for id %lu (%s:%d).",
               ptr->id, file, lineno );
     problemCallbackCalled++;
@@ -499,5 +499,5 @@
 psMemId memAllocCallback( const psMemBlock *ptr )
 {
-    psLogMsg( __func__, PS_LOG_INFO, "block %lld was (re)allocated", ptr->id );
+    psLogMsg( __func__, PS_LOG_INFO, "block %lu was (re)allocated", ptr->id );
     allocCallbackCalled++;
     return 1;
@@ -506,5 +506,5 @@
 psMemId memFreeCallback( const psMemBlock *ptr )
 {
-    psLogMsg( __func__, PS_LOG_INFO, "block %lld was freed", ptr->id );
+    psLogMsg( __func__, PS_LOG_INFO, "block %lu was freed", ptr->id );
     freeCallbackCalled++;
     return 1;