=== modified file 'debian/patches/04_fix_pumps_include_server_path.dpatch' --- debian/patches/04_fix_pumps_include_server_path.dpatch 2011-04-19 10:25:04 +0000 +++ debian/patches/04_fix_pumps_include_server_path.dpatch 2012-11-10 11:45:03 +0000 @@ -1,6 +1,6 @@ #! /bin/sh -e -## 03_do_not_install_redhat_config.dpatch by Carsten Wolff -## Improve determination of python modules version/path by Dustin Kirkland +## 04_fix_pumps_include_server_path.dpatch by Carsten Wolff +## Update to use private module path by Daniel Hartwig if [ $# -ne 1 ]; then echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" @@ -19,12 +19,21 @@ @DPATCH@ --- distcc-3.1.orig/source/Makefile.in +++ distcc-3.1/source/Makefile.in +@@ -1049,7 +1049,7 @@ + --build-base="$(include_server_builddir)" \ + --build-temp="$(include_server_builddir)" \ + install \ +- --prefix="$(prefix)" \ ++ --install-lib="$(prefix)/lib/distcc-pump" \ + --record="$(include_server_builddir)/install.log.pre" \ + --root="$$DESTDIR" \ + || exit 1; \ @@ -1061,7 +1061,7 @@ cp -f "$(include_server_builddir)/install.log" "$(PYTHON_INSTALL_RECORD)"; \ fi; \ $(mkinstalldirs) "$(DESTDIR)$(bindir)" && \ - INCLUDE_SERVER=`grep '/include_server.py$$' "$(include_server_builddir)/install.log"` && \ -+ INCLUDE_SERVER=`ls /usr/lib/pymodules/python2.*/include_server/include_server.py | tail -n1 | sed "s,bin,lib,"` && \ ++ INCLUDE_SERVER="/usr/lib/distcc-pump/include_server/include_server.py" && \ sed "s,^include_server='',include_server='$$INCLUDE_SERVER'," \ pump > "$(include_server_builddir)/pump" && \ $(INSTALL_PROGRAM) "$(include_server_builddir)/pump" "$(DESTDIR)$(bindir)"; \ === modified file 'debian/rules' --- debian/rules 2010-03-19 06:42:25 +0000 +++ debian/rules 2012-11-10 11:45:03 +0000 @@ -44,7 +44,8 @@ --sysconfdir=/etc \ --with-gnome \ --enable-rfc2553 \ - --disable-Werror + --disable-Werror \ + PYTHON=$(shell which `pyversions -d`) #Architecture build: patch-stamp build-arch build-indep