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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 45c0c4d596415cbbdc68e8a09fa15cc276422f20
Author: Steffen Moeller <moeller at debian.org>
Date:   Wed Feb 15 23:56:52 2012 +0100

    Improved debian-speicific stability of builds
    
    debian/rules may more reliably be called directly
    rather than through git-buildpackage.

diff --git a/debian/patches/cppcheck_realloc.patch b/debian/patches/cppcheck_realloc.patch
index ef1a1a9..7855acb 100644
--- a/debian/patches/cppcheck_realloc.patch
+++ b/debian/patches/cppcheck_realloc.patch
@@ -16,11 +16,11 @@ Index: boinc/lib/parse.cpp
 +            else {
 +                b = (char*)realloc(buf, nused+n+2);
 +		if (!b) {
-+                   fprintf(STDERR,"Ran out of memory.\n");
++                   fprintf(stderr,"Ran out of memory.\n");
 +                   free(buf);
 +                   return ERR_XML_PARSE;
 +		}
-+                buffsize = nused+n+2;
++               bufsize = nused+n+2;
 +		buf = b;
 +            }
          }
diff --git a/debian/rules b/debian/rules
index 9127d39..358cc19 100755
--- a/debian/rules
+++ b/debian/rules
@@ -281,8 +281,11 @@ override_dh_auto_clean:
 	  packages/solaris/CSW/boincmanager/Makefile
 	debconf-updatepo
 
-override_dh_auto_install: update-boinc-applinks.1
+override_dh_auto_install: update-boinc-applinks.1 $(SAMPLES)
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+	mkdir -p $(CURDIR)/debian/tmp/samples
+	cp $(SAMPLES) $(CURDIR)/debian/tmp/samples
+	
 	dh_install
 	for i in $(CURDIR)/debian/*/usr/bin ; \
 	do \

-- 
BOINC packaging