[SCM] BOINC packaging branch, debian-folder-HEAD, updated. 2d45bcdf85fbf70b39d0d0dcf5042a416aba16bd

[Steffen Moeller]

The following commit has been merged in the debian-folder-HEAD branch:
commit 2d45bcdf85fbf70b39d0d0dcf5042a416aba16bd
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Sun Jan 6 23:52:26 2013 +0100

    Uploaded to new queue.

diff --git a/debian/changelog b/debian/changelog
index b29a03f..d1a8eb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,9 +10,7 @@ boinc-experimental (7.0.42+20130101+dfsg-1) UNRELEASED; urgency=low
   * Initial release of server packages from the BOINC trunk
     - debian/control.in may be told to prepare also other packages
     - introduction of boinc-server-dbg
-  * boinc-server-maker changed dependencies
-    - moved boinc-stripchart library to suggests
-    - added coreutils because of 'arch'
+  * boinc-server-maker dependencies moved boinc-stripchart library to suggests
   * added libxext-dev build-dependency for idle detection
 
  -- Steffen Moeller <moeller at debian.org>  Fri, 28 Dec 2012 21:24:37 +0100
diff --git a/debian/rules b/debian/rules
index a14a996..4e27adb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,9 @@
 #export  CC=/usr/lib/gcc-snapshot/bin/gcc
 #export CXX=/usr/lib/gcc-snapshot/bin/g++
 #export CPP=/usr/lib/gcc-snapshot/bin/cpp
-export  CC=gcc-4.8
-export CXX=g++-4.8
-export CPP=cpp-4.8
+#export  CC=gcc-4.8
+#export CXX=g++-4.8
+#export CPP=cpp-4.8
 
 # Set default flags with dpkg-buildflags
 # -Wformat -Werror=format-security will need many fixes to avoid ftbfs,
@@ -276,13 +276,13 @@ BINARIES += samples/worker/worker samples/wrapper/wrapper samples/sleeper/sleepe
 	samples/atiopencl/atiopencl
 
 override_dh_auto_clean: 
-	-dh_auto_clean
-	-$(MAKE) -C samples/sleeper distclean
+	dh_auto_clean
+	[ -r samples/sleeper/Makefile ] && $(MAKE) -C samples/sleeper distclean
 	# fail on unpatched source
 	# $(MAKE) -C samples/worker distclean
 	rm -rf samples/worker/worker samples/worker/worker.o
-	-$(MAKE) -C samples/example_app distclean || $(MAKE) -C samples/example_app clean
-	-$(MAKE) -C samples/wrapper distclean || $(MAKE) -C samples/wrapper clean
+	[ -r samples/example_app/Makefile ] && $(MAKE) -C samples/example_app distclean || $(MAKE) -C samples/example_app clean
+	[ -r samples/wrapper/Makefile ] && $(MAKE) -C samples/wrapper distclean || $(MAKE) -C samples/wrapper clean
 	find . -name Makefile.in -o -name "*.a" -o -name "*.o" | xargs -r rm
 	find . -name "Makefile" | grep -v samples | xargs -r rm
 	rm -f configure clientscr/boincscr

-- 
BOINC packaging