diff -Nru pegasus-wms-4.0.1+dfsg/debian/changelog pegasus-wms-4.0.1+dfsg/debian/changelog
--- pegasus-wms-4.0.1+dfsg/debian/changelog	2012-06-18 15:47:13.000000000 +0100
+++ pegasus-wms-4.0.1+dfsg/debian/changelog	2012-06-29 19:03:18.000000000 +0100
@@ -1,3 +1,11 @@
+pegasus-wms (4.0.1+dfsg-6+rpi1) wheezy; urgency=low
+
+  * Revert to openjdk-6 as raspbian doesn't have openjdk-7
+  * Handle svnversion returning Unversioned directory rather than an empty 
+    string.
+
+ -- Peter Michael Green <plugwash@p10link.net>  Fri, 29 Jun 2012 11:59:04 +0000
+
 pegasus-wms (4.0.1+dfsg-6) unstable; urgency=low
 
   * Fixed pegasus-wms-doc misspelling in Suggests:
diff -Nru pegasus-wms-4.0.1+dfsg/debian/control pegasus-wms-4.0.1+dfsg/debian/control
--- pegasus-wms-4.0.1+dfsg/debian/control	2012-06-18 15:48:17.000000000 +0100
+++ pegasus-wms-4.0.1+dfsg/debian/control	2012-06-29 13:01:31.000000000 +0100
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Mats Rynge <mats@rynge.net>
 Build-Depends: debhelper (>= 9), 
-               openjdk-7-jdk,
+               openjdk-6-jdk,
                ant,
                docbook-xsl,
                docbook-xml,
diff -Nru pegasus-wms-4.0.1+dfsg/debian/patches/fix-build-with-new-subversion.patch pegasus-wms-4.0.1+dfsg/debian/patches/fix-build-with-new-subversion.patch
--- pegasus-wms-4.0.1+dfsg/debian/patches/fix-build-with-new-subversion.patch	1970-01-01 01:00:00.000000000 +0100
+++ pegasus-wms-4.0.1+dfsg/debian/patches/fix-build-with-new-subversion.patch	2012-06-29 19:09:18.000000000 +0100
@@ -0,0 +1,34 @@
+Description: fix build with new subversion
+ Recent versions of subversion return "Unversioned directory" in response
+ to svnversion . in a non-svn  directory, this breaks the build process
+ due to an inability to handle spaces in this field, the attached patch
+ fixes this by not defining -DHAS_SVNVERSION if svnversion . reutrns
+ "Unversioned directory"
+Author: Peter Michael Green <plugwash@p10link.net>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- pegasus-wms-4.0.1+dfsg.orig/src/tools/pegasus-keg/Makefile
++++ pegasus-wms-4.0.1+dfsg/src/tools/pegasus-keg/Makefile
+@@ -129,8 +129,10 @@ CONDOR_CXX = $(CONDOR) $(CXX)
+ 
+ SVNVERSION = $(shell svnversion . 2>> /dev/null)
+ ifneq (,${SVNVERSION})
++ifneq (Unversioned directory,${SVNVERSION})
+ CXXFLAGS += -DHAS_SVNVERSION=\"${SVNVERSION}\"
+ endif
++endif
+ 
+ # add large file support
+ ifneq (,${LFS_CFLAGS})
diff -Nru pegasus-wms-4.0.1+dfsg/debian/patches/series pegasus-wms-4.0.1+dfsg/debian/patches/series
--- pegasus-wms-4.0.1+dfsg/debian/patches/series	2012-05-29 16:28:05.000000000 +0100
+++ pegasus-wms-4.0.1+dfsg/debian/patches/series	2012-06-29 19:06:52.000000000 +0100
@@ -3,3 +3,4 @@
 doc-build
 classpath
 portability
+fix-build-with-new-subversion.patch
diff -Nru pegasus-wms-4.0.1+dfsg/debian/rules pegasus-wms-4.0.1+dfsg/debian/rules
--- pegasus-wms-4.0.1+dfsg/debian/rules	2012-06-18 15:48:42.000000000 +0100
+++ pegasus-wms-4.0.1+dfsg/debian/rules	2012-06-29 13:00:31.000000000 +0100
@@ -4,7 +4,7 @@
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
-JAVA_HOME := $(firstword $(wildcard /usr/lib/jvm/java-7-openjdk-$(DEB_HOST_ARCH)))
+JAVA_HOME := $(firstword $(wildcard /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH)))
 PATH := ${JAVA_HOME}/bin:${PATH}
 
 JARS := commons-logging.jar commons-pool.jar gnu-getopt.jar log4j-1.2.jar mysql-connector-java.jar xml-resolver.jar xercesImpl.jar xmlParserAPIs.jar xmlrpc-common.jar