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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 25884ff92d0756b67b3341e91f4a6ae1a871a2a8
Author: Steffen Moeller <moeller at debian.org>
Date:   Sat Jun 4 19:38:03 2011 +0200

    Smoothing.

diff --git a/debian/boinc-server-maker.install b/debian/boinc-server-maker.install
index 94c172a..190ac59 100644
--- a/debian/boinc-server-maker.install
+++ b/debian/boinc-server-maker.install
@@ -90,7 +90,10 @@ sched/update_stats		    usr/lib/boinc-server/bin
 sched/wu_check		    usr/lib/boinc-server/bin
 
 #usr/bin/crypt_prog		     usr/lib/boinc-server/bin
-lib/crypt_prog		     usr/lib/boinc-server/bin
+# In lib/crypt_prog is just a wrapper for the real binary
+# (presumed to be executing just as fine) in lib/.libs/crypt_prog
+#lib/crypt_prog		     usr/lib/boinc-server/bin
+lib/.libs/crypt_prog		     usr/lib/boinc-server/bin
 #usr/bin/switcher		     usr/lib/boinc-server/bin	# also in client
 
 
diff --git a/debian/changelog b/debian/changelog
index f0fa2e2..8039aee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ boinc (6.12.28+dfsg-3) UNRELEASED; urgency=low
 
    * Added explicit dependency on python-support for boinc-server-maker.
    * Overriding csh and soname lintian warnings.
+   * Addressing the crypt_prog issue.
+   * Eliminating build path from python config
 
  -- Steffen Moeller <moeller at debian.org>  Sat, 28 May 2011 10:44:59 +0200
 
diff --git a/debian/rules b/debian/rules
index c819fb5..34f62ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -268,6 +268,7 @@ install: install-stamp
 install-stamp: build update-boinc-applinks.1
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 	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