diff -Nru condor-8.4.11~dfsg.1/debian/changelog condor-8.4.11~dfsg.1/debian/changelog
--- condor-8.4.11~dfsg.1/debian/changelog	2017-01-25 15:45:20.000000000 +0000
+++ condor-8.4.11~dfsg.1/debian/changelog	2017-08-12 18:45:51.000000000 +0000
@@ -1,3 +1,13 @@
+condor (8.4.11~dfsg.1-1+rpi1) buster-staging; urgency=medium
+
+  * Adopt changes from ubuntu 8.4.11~dfsg.1-1ubuntu1 by Michael Hudson-Doyle
+    + Add d/patches/fix_linker_script to fix FTBFS by exporting functions created
+      by the new libgsoap.
+  * Add build-conflicts on liblog4cpp5-dev, if it is installed then the
+    package tries and fails to build "cream" support.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 12 Aug 2017 18:45:51 +0000
+
 condor (8.4.11~dfsg.1-1) unstable; urgency=medium
 
   * New upstream bugfix release.
diff -Nru condor-8.4.11~dfsg.1/debian/control condor-8.4.11~dfsg.1/debian/control
--- condor-8.4.11~dfsg.1/debian/control	2017-01-25 15:45:20.000000000 +0000
+++ condor-8.4.11~dfsg.1/debian/control	2017-08-12 18:45:51.000000000 +0000
@@ -1,5 +1,6 @@
 Source: condor
-Maintainer: HTCondor Developers <condor-debian@cs.wisc.edu>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: HTCondor Developers <condor-debian@cs.wisc.edu>
 Uploaders: Michael Hanke <mih@debian.org>,
            Tim Theisen <tim@cs.wisc.edu>
 Section: science
@@ -40,6 +41,7 @@
                transfig,
                uuid-dev,
                zlib1g-dev
+Build-Conflicts: liblog4cpp5-dev
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-exppsy/condor.git
 Vcs-Git: git://anonscm.debian.org/pkg-exppsy/condor.git
diff -Nru condor-8.4.11~dfsg.1/debian/patches/fix_linker_script condor-8.4.11~dfsg.1/debian/patches/fix_linker_script
--- condor-8.4.11~dfsg.1/debian/patches/fix_linker_script	1970-01-01 00:00:00.000000000 +0000
+++ condor-8.4.11~dfsg.1/debian/patches/fix_linker_script	2017-07-26 00:56:52.000000000 +0000
@@ -0,0 +1,10 @@
+--- a/src/condor_daemon_core.V6/daemon.version.proper
++++ b/src/condor_daemon_core.V6/daemon.version.proper
+@@ -8,6 +8,6 @@
+ #
+ condor_daemon {
+   # Note the C++ mangling here.
+-  global: _Z14dc_soap_acceptP4SockPK4soap; _Z13dc_soap_serveP4soap; _Z12dc_soap_freeP4soap; _Z12dc_soap_initRP4soap; soap_putheader; soap_serializeheader; soap_faultstring; soap_faultsubcode; soap_faultcode; soap_getheader; soap_getfault; namespaces; soap_faultdetail; soap_putfault; soap_serializefault; soap_check_faultdetail; soap_markelement; soap_check_faultsubcode; soap_getelement; soap_putelement;
++  global: _Z14dc_soap_acceptP4SockPK4soap; _Z13dc_soap_serveP4soap; _Z12dc_soap_freeP4soap; _Z12dc_soap_initRP4soap; soap_putheader; soap_serializeheader; soap_faultstring; soap_faultsubcode; soap_faultcode; soap_getheader; soap_getfault; namespaces; soap_faultdetail; soap_putfault; soap_serializefault; soap_check_faultdetail; soap_markelement; soap_check_faultsubcode; soap_getelement; soap_putelement; soap_delelement; soap_dupelement;
+   local: *;
+ };
diff -Nru condor-8.4.11~dfsg.1/debian/patches/series condor-8.4.11~dfsg.1/debian/patches/series
--- condor-8.4.11~dfsg.1/debian/patches/series	2017-01-25 15:45:20.000000000 +0000
+++ condor-8.4.11~dfsg.1/debian/patches/series	2017-07-26 00:48:20.000000000 +0000
@@ -15,3 +15,4 @@
 qsub_sentinel_robustness
 raspbian_detection
 fix_bashisms
+fix_linker_script