[SCM] BOINC packaging branch, master, updated. debian/7.0.33+dfsg-1-38-g300d58c

[Guo Yixuan]

The following commit has been merged in the master branch:
commit bc1488289128cf188f3c91646f0ebcea5546974b
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Mon Sep 3 23:45:29 2012 +0800

    better clean in makefiles

diff --git a/debian/patches/better_makefiles.patch b/debian/patches/better_makefiles.patch
new file mode 100644
index 0000000..e305cd3
--- /dev/null
+++ b/debian/patches/better_makefiles.patch
@@ -0,0 +1,57 @@
+Author: Guo Yixuan <culu.gyx at gmail.com>
+Description: Better clean target for several Makefiles
+ This would save some rm's in override_dh_auto_clean.
+Index: boinc/samples/sleeper/Makefile
+===================================================================
+--- boinc.orig/samples/sleeper/Makefile	2012-09-03 23:38:52.540022451 +0800
++++ boinc/samples/sleeper/Makefile	2012-09-03 23:38:52.760022452 +0800
+@@ -19,11 +19,10 @@
+ libstdc++.a:
+ 	ln -s `g++ -print-file-name=libstdc++.a`
+ 
+-clean:
+-	rm $(PROGS)
++clean: distclean
+ 
+ distclean:
+-	/bin/rm -f $(PROGS) *.o libstdc++.a
++	rm -f $(PROGS) *.o libstdc++.a
+ 
+ sleeper: sleeper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
+ 	g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o sleeper sleeper.o libstdc++.a -pthread -lboinc_api -lboinc
+Index: boinc/samples/worker/Makefile
+===================================================================
+--- boinc.orig/samples/worker/Makefile	2012-09-03 23:38:52.540022451 +0800
++++ boinc/samples/worker/Makefile	2012-09-03 23:42:40.068022649 +0800
+@@ -4,11 +4,10 @@
+ 
+ all: $(PROGS)
+ 
+-clean:
+-	rm $(PROGS)
++clean: distclean
+ 
+ distclean:
+-	rm $(PROGS)
++	rm -f $(PROGS) *.o
+ 
+ worker: worker.o
+ 	g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o worker worker.o
+Index: boinc/samples/wrapper/Makefile
+===================================================================
+--- boinc.orig/samples/wrapper/Makefile	2012-09-03 23:38:52.540022451 +0800
++++ boinc/samples/wrapper/Makefile	2012-09-03 23:39:50.908022502 +0800
+@@ -21,11 +21,10 @@
+ libstdc++.a:
+ 	ln -s `g++ -print-file-name=libstdc++.a`
+ 
+-clean:
+-	rm $(PROGS) *.o
++clean: distclean
+ 
+ distclean:
+-	/bin/rm -f $(PROGS) *.o libstdc++.a
++	rm -f $(PROGS) *.o libstdc++.a
+ 
+ wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
+ 	g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wrapper wrapper.o libstdc++.a -pthread -lboinc_api -lboinc
diff --git a/debian/patches/series b/debian/patches/series
index 453253e..d3991eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -71,3 +71,4 @@ ignored_return_value.patch
 cppcheck_avoid_redundant_check.patch
 opendir_errno.patch
 ticket_1168_verifycerts.patch
+better_makefiles.patch
diff --git a/debian/rules b/debian/rules
index cc7a225..d3f3afc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -253,6 +253,12 @@ BINARIES += samples/worker/worker samples/wrapper/wrapper samples/sleeper/sleepe
 
 override_dh_auto_clean: 
 	dh_auto_clean
+	$(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/wrapper distclean
 	find . -name Makefile.in -o -name "*.a" -o -name "*.o" | xargs -r rm
 	rm -rf debian/tmp autoreconf-stamp build-*-stamp install-*-stamp lib/crypt_prog
 	rm -rf  py/build py/lib.linux-x86_64-2.6

-- 
BOINC packaging