diff -Nru condor-7.8.8~dfsg.1/debian/changelog condor-7.8.8~dfsg.1/debian/changelog --- condor-7.8.8~dfsg.1/debian/changelog 2013-12-16 15:43:32.000000000 +0000 +++ condor-7.8.8~dfsg.1/debian/changelog 2014-01-05 16:17:45.000000000 +0000 @@ -1,3 +1,11 @@ +condor (7.8.8~dfsg.1-2.1+rpi1) jessie-staging; urgency=medium + + * Files are getting installed in the wrong places for unknown reasons, + i've contacted upstream about this but in the meantime we need this to build + so move them back manually. + + -- Peter Michael Green Sun, 05 Jan 2014 16:16:50 +0000 + condor (7.8.8~dfsg.1-2.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru condor-7.8.8~dfsg.1/debian/rules condor-7.8.8~dfsg.1/debian/rules --- condor-7.8.8~dfsg.1/debian/rules 2013-07-18 06:25:24.000000000 +0000 +++ condor-7.8.8~dfsg.1/debian/rules 2014-01-05 16:15:40.000000000 +0000 @@ -93,8 +93,24 @@ rm debian/tmp/usr/sbin/condor_vm_vmware.pl rm debian/tmp/usr/sbin/grid_monitor.sh - override_dh_install: + # raspbian hack, these files end up in the wrong place for reasons unknown, move them back to the right place + mkdir -p debian/tmp/usr/share/doc/condor/etc/ + -mv debian/tmp/usr/etc/examples debian/tmp/usr/share/doc/condor/etc/ + -mv debian/tmp/usr/etc debian/tmp + mkdir -p debian/tmp/usr/lib/condor/ + -mv debian/tmp/usr/lib/condor_ssh_to_job_sshd_config_template debian/tmp/usr/lib/condor/ + -mv debian/tmp/usr/libexec debian/tmp/usr/lib/condor/ + -mv debian/tmp/usr/lib/libchirp_client.so debian/tmp/usr/lib/libcondorapi.so debian/tmp/usr/lib/libcondor_utils_7_8_8.so debian/tmp/usr/lib/condor/ + -mv debian/tmp/usr/lib/libchirp_client.a debian/tmp/usr/lib/libcondorapi.a debian/tmp/usr/lib/condor/ + -mv debian/tmp/usr/lib/*.pm debian/tmp/usr/lib/condor/ + -mv debian/tmp/usr/examples debian/tmp/usr/share/doc/condor/ + mkdir -p debian/tmp/usr/include/condor + -mv debian/tmp/usr/include/*.h debian/tmp/usr/include/condor/ + mkdir -p debian/tmp/etc/default + cp debian/tmp/usr/share/doc/condor/etc/examples/condor.sysconfig debian/tmp/etc/default/condor + cp debian/tmp/usr/share/doc/condor/etc/examples/condor_config debian/tmp/etc/condor/ + #end raspbian hack dh_install # fix permissions chmod -x debian/condor/usr/lib/condor/*.pm @@ -102,7 +118,7 @@ # remove RPATH from public lib chrpath -d debian/libclassad*/usr/lib/libclassad.so.*.* # kill the default local config -- debconf will handle that - rm debian/condor/etc/condor/condor_config.local + rm -f debian/condor/etc/condor/condor_config.local # modify condor config file with default Debian config sed -i \ -e 's,^[#]*\(REQUIRE_LOCAL_CONFIG_FILE\s*=\).*,\1 FALSE,' \