diff -Nru condor-8.2.3~dfsg.1/debian/changelog condor-8.2.3~dfsg.1/debian/changelog
--- condor-8.2.3~dfsg.1/debian/changelog	2015-01-16 17:59:28.000000000 +0000
+++ condor-8.2.3~dfsg.1/debian/changelog	2015-05-13 22:46:38.000000000 +0000
@@ -1,3 +1,17 @@
+condor (8.2.3~dfsg.1-6+rpi2) stretch-staging; urgency=medium
+
+  * Fix use of peer field in struct soap for new unions (Closes: 784778)
+  * Bump build-dependency on gsoap because i'm pretty sure the above
+    fix will break builds with older gsoap.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Wed, 13 May 2015 19:59:14 +0000
+
+condor (8.2.3~dfsg.1-6+rpi1) jessie-staging; urgency=medium
+
+  * Add raspbian to OS detection code.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 18 Apr 2015 22:22:34 +0000
+
 condor (8.2.3~dfsg.1-6) unstable; urgency=medium
 
   [Alex Waite]
diff -Nru condor-8.2.3~dfsg.1/debian/control condor-8.2.3~dfsg.1/debian/control
--- condor-8.2.3~dfsg.1/debian/control	2015-01-15 09:00:38.000000000 +0000
+++ condor-8.2.3~dfsg.1/debian/control	2015-05-13 22:18:45.000000000 +0000
@@ -35,7 +35,7 @@
  chrpath,
  libldap2-dev | libldap-dev,
  help2man,
- gsoap (>= 2.7.17-1~),
+ gsoap (>= 2.8.22-1~),
  libboost-test-dev,
  libboost-python-dev,
  libkrb5-dev,
diff -Nru condor-8.2.3~dfsg.1/debian/patches/add-raspbian condor-8.2.3~dfsg.1/debian/patches/add-raspbian
--- condor-8.2.3~dfsg.1/debian/patches/add-raspbian	1970-01-01 00:00:00.000000000 +0000
+++ condor-8.2.3~dfsg.1/debian/patches/add-raspbian	2015-04-18 22:22:54.000000000 +0000
@@ -0,0 +1,21 @@
+Description: add raspbian to os detection code.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+--- condor-8.0.5~dfsg.1.orig/build/cmake/macros/SystemSpecificInformations.cmake
++++ condor-8.0.5~dfsg.1/build/cmake/macros/SystemSpecificInformations.cmake
+@@ -159,7 +159,14 @@ if(UNIX)
+ 	set(LINUX_VER "${CMAKE_MATCH_1}")        
+ 	set(SYSTEM_NAME "Debian-${CMAKE_MATCH_1}")
+ 	set(DEB_SYSTEM_NAME "deb_${CMAKE_MATCH_1}")
+-      endif(LINUX_ISSUE MATCHES "Debian")      
++      endif(LINUX_ISSUE MATCHES "Debian")
++      if(LINUX_ISSUE MATCHES "Raspbian")
++        string(REGEX MATCH "Raspbian .*ux ([0-9]+(\\.[0-9]+)?)" DEBIAN "${LINUX_ISSUE}")
++        set(LINUX_NAME "Raspbian")
++	set(LINUX_VER "${CMAKE_MATCH_1}")        
++	set(SYSTEM_NAME "Debian-${CMAKE_MATCH_1}")
++	set(DEB_SYSTEM_NAME "deb_${CMAKE_MATCH_1}")
++      endif(LINUX_ISSUE MATCHES "Raspbian")
+       # SuSE / openSUSE case
+       if(LINUX_ISSUE MATCHES "openSUSE")
+         string(REGEX MATCH "openSUSE ([0-9]+\\.[0-9]+)" OPENSUSE "${LINUX_ISSUE}")
diff -Nru condor-8.2.3~dfsg.1/debian/patches/fix-gsoap-2.8.22 condor-8.2.3~dfsg.1/debian/patches/fix-gsoap-2.8.22
--- condor-8.2.3~dfsg.1/debian/patches/fix-gsoap-2.8.22	1970-01-01 00:00:00.000000000 +0000
+++ condor-8.2.3~dfsg.1/debian/patches/fix-gsoap-2.8.22	2015-05-13 22:18:45.000000000 +0000
@@ -0,0 +1,38 @@
+Description: Fix for gsoap 2.8.22
+  Fix use of peer field in struct soap for new unions (Closes: 784778)
+Author: Peter Michael Green <plugwash@debian.org>
+Bug-Debian: https://bugs.debian.org/784778
+
+---
+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: https://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>
+
+--- condor-8.2.3~dfsg.1.orig/src/condor_schedd.V6/soap_scheddStub.cpp
++++ condor-8.2.3~dfsg.1/src/condor_schedd.V6/soap_scheddStub.cpp
+@@ -86,7 +86,7 @@ verify(DCpermission perm,
+ 
+ 
+ 	if (daemonCore->Verify("SOAP",perm,
+-				&soap->peer,
++				&soap->peer.addr,
+ 				soap->user ? (char*)soap->user : NULL) != USER_AUTH_SUCCESS)
+ 	{
+ 		status.code = FAIL;
+@@ -286,7 +286,7 @@ stub_prefix(const char* stub_name,   //
+ 			ASSERT(entry->qmgmt_state);
+ 				// tell qmgmt info about our client - addr and user
+ 			ASSERT(soap);
+-			condor_sockaddr addr(&soap->peer);
++			condor_sockaddr addr(&soap->peer.addr);
+ 			entry->qmgmt_state->set(addr, (const char*)soap->user);
+ 		}
+ 
diff -Nru condor-8.2.3~dfsg.1/debian/patches/series condor-8.2.3~dfsg.1/debian/patches/series
--- condor-8.2.3~dfsg.1/debian/patches/series	2015-01-16 17:53:02.000000000 +0000
+++ condor-8.2.3~dfsg.1/debian/patches/series	2015-05-13 22:19:10.000000000 +0000
@@ -14,3 +14,5 @@
 noformat_arg
 as-needed-libs-ftbfs.patch
 qsub_sentinel_robustness
+add-raspbian
+fix-gsoap-2.8.22