Index: trunk/ippTools/src/difftool.c
===================================================================
--- trunk/ippTools/src/difftool.c	(revision 38040)
+++ trunk/ippTools/src/difftool.c	(revision 38041)
@@ -1252,5 +1252,5 @@
   }
   
-  PXOPT_LOOKUP_BOOL(available, config->args, "-available", false);
+  // PXOPT_LOOKUP_BOOL(available, config->args, "-available", false);
   PXOPT_LOOKUP_BOOL(bothways, config->args, "-bothways", false);
   
Index: trunk/ippconfig/recipes/psastro.config
===================================================================
--- trunk/ippconfig/recipes/psastro.config	(revision 38040)
+++ trunk/ippconfig/recipes/psastro.config	(revision 38041)
@@ -187,4 +187,6 @@
 MASKSTAT.ADVISORY   U32 0x080
 
+TRANSFORM.GALAXY.SHAPE.ERRORS  BOOL F
+
 # maximum allowed fwhm_major (moved from */camera.config)
 PSASTRO.MAX.ALLOWED.FWHM    F32     0
Index: trunk/ppSim/src/Makefile.am
===================================================================
--- trunk/ppSim/src/Makefile.am	(revision 38040)
+++ trunk/ppSim/src/Makefile.am	(revision 38041)
@@ -1,23 +1,8 @@
 bin_PROGRAMS = ppSim ppSimSequence
-
-if HAVE_SVNVERSION
-PPSIM_VERSION=`$(SVNVERSION) ..`
-else
-PPSIM_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PPSIM_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
-PPSIM_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PPSIM_BRANCH="UNKNOWN"
-PPSIM_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of ppSimVersion.c, since it gets the version information
 ppSimVersion.c: ppSimVersionDefinitions.h
 ppSimVersionDefinitions.h: ppSimVersionDefinitions.h.in FORCE
-	-$(RM) ppSimVersionDefinitions.h
-	$(SED) -e "s|@PPSIM_VERSION@|\"$(PPSIM_VERSION)\"|" -e "s|@PPSIM_BRANCH@|\"$(PPSIM_BRANCH)\"|" -e "s|@PPSIM_SOURCE@|\"$(PPSIM_SOURCE)\"|" ppSimVersionDefinitions.h.in > ppSimVersionDefinitions.h
+	pslib-setsvnversion.pl PPSIM ppSimVersionDefinitions.h.in ppSimVersionDefinitions.h
 FORCE: ;
 
Index: trunk/ppSim/src/ppSimInsertGalaxies.c
===================================================================
--- trunk/ppSim/src/ppSimInsertGalaxies.c	(revision 38040)
+++ trunk/ppSim/src/ppSimInsertGalaxies.c	(revision 38041)
@@ -82,5 +82,5 @@
 
     pmPSF *psf = psMetadataLookupPtr (&mdok, chip->analysis, "PSPHOT.PSF");
-    assert (psf);
+    psAssert (psf, "missing PSPHOT.PSF on chip.analysis");
 
     int dX = PM_CELL_TO_CHIP (0.0, x0Cell, xParityCell, binning);
Index: trunk/psconfig/psconfig.csh.in
===================================================================
--- trunk/psconfig/psconfig.csh.in	(revision 38040)
+++ trunk/psconfig/psconfig.csh.in	(revision 38041)
@@ -323,5 +323,5 @@
  case linux:
  case linrh:
-   gcc --version | grep -e 4.6 -e 4.5 | grep Ubuntu >& /dev/null
+   gcc --version | grep -e 4.8 -e 4.6 -e 4.5| grep Ubuntu >& /dev/null
    if ($status == 0) then
     set xtraflags = "-Wl,--no-as-needed"
@@ -335,5 +335,5 @@
  case lin64:
  case linrh64:
-   gcc --version | grep -e 4.6 -e 4.5 | grep Ubuntu >& /dev/null
+   gcc --version | grep -e 4.8 -e 4.6 -e 4.5 | grep Ubuntu >& /dev/null
    if ($status == 0) then
     set xtraflags = "-Wl,--no-as-needed"
Index: trunk/psconfig/tagsets/ipp-3.0.dist
===================================================================
--- trunk/psconfig/tagsets/ipp-3.0.dist	(revision 38040)
+++ trunk/psconfig/tagsets/ipp-3.0.dist	(revision 38041)
@@ -31,10 +31,7 @@
   NNYYN  pclient                ipp-2-9          -0      
           
+# psLib-based code needs the nebclient library to interact with nebulous
   YNNYY  Nebulous/nebclient     ipp-2-9          -0
-  YNNYY  Nebulous               ipp-2-9          -0
-  YNNYY  Nebulous-Server        ipp-2-9          -0
-  YYYYY  PS-IPP-Metadata-Config ipp-2-9          -0
-  YYYYY  PS-IPP-Config          ipp-2-9          -0     
-          
+
   YYYYY  psLib                  ipp-2-9          -0
   YYYYY  psModules              ipp-2-9          -0
@@ -54,4 +51,9 @@
   YYYYY  ppSub                  ipp-2-9          -0
   YYYYY  ppSim                  ipp-2-9          -0
+          
+  YNNYY  Nebulous               ipp-2-9          -0
+  YNNYY  Nebulous-Server        ipp-2-9          -0
+  YYYYY  PS-IPP-Metadata-Config ipp-2-9          -0
+  YYYYY  PS-IPP-Config          ipp-2-9          -0     
           
   YNNYY  glueforge              ipp-2-9          -0