[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-245-g8881440

[Steffen Moeller]

The following commit has been merged in the master branch:
commit a14908ee7dbbd51d2911ccae977ecd91c155d095
Author: Steffen Moeller <moeller at debian.org>
Date:   Sat Jun 4 21:52:52 2011 +0200

    Fixing FTBFS

diff --git a/debian/changelog b/debian/changelog
index 91dcf77..ac36f19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+boinc (6.12.28+dfsg-4) unstable; urgency=low
+
+   * Fixed target of sed instruction (and FTBFS with it)
+   * Explicitly setting CPPFLAGS to empty, which may help
+     kfreebsd.
+
+ -- Steffen Moeller <moeller at debian.org>  Sat, 04 Jun 2011 21:51:53 +0200
+
 boinc (6.12.28+dfsg-3) unstable; urgency=low
 
    * Added explicit dependency on python-support for boinc-server-maker.
diff --git a/debian/rules b/debian/rules
index 34f62ad..912515b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -146,7 +146,7 @@ override_dh_auto_configure:
 	@echo
 	cp -f /usr/share/misc/config.guess config.guess
 	cp -f /usr/share/misc/config.sub config.sub
-	./configure $(CFGFLAGS_boinc-client)
+	./configure $(CFGFLAGS_boinc-client) CPPFLAGS=""
 
 update-boinc-applinks.1: debian/manpages/update-boinc-applinks.xml
 	docbook2x-man debian/manpages/update-boinc-applinks.xml
@@ -267,8 +267,8 @@ install: install-stamp
 
 install-stamp: build update-boinc-applinks.1
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+	sed -i 's%^TOP_BUILD_DIR.*%TOP_BUILD_DIR = "/usr/share/boinc-server-maker"%' $(CURDIR)/debian/tmp/usr/lib/python2.6/site-packages/boinc_path_config.py
 	dh install
-	sed -i 's%^TOP_BUILD_DIR.*%TOP_BUILD_DIR = "/usr/share/boinc-server-maker"%' debian/boinc-server-maker/usr/share/pyshared/Boinc/boinc_path_config.py
 	touch $@
 
 override_dh_strip:

-- 
BOINC packaging