[SCM] BOINC packaging branch, master, updated. debian/7.0.27+dfsg-3-57-ga41298a

[Guo Yixuan]

The following commit has been merged in the master branch:
commit a41298a58c07746d22a36e814c27b4bb33eadc50
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Tue Jul 10 23:54:34 2012 +0800

    get rid of build-stamp
    
    phony target doesn't work with pattern rules, so remove build from
    .PHONY.

diff --git a/debian/changelog b/debian/changelog
index 9eddc14..29243fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,9 @@ boinc (7.0.31+dfsg-1) UNRELEASED; urgency=low
     - remove dependency on python-support.
     - libboinc-app-dev: depend on libboinc.
   * debian/watch: check for even minor version, and fix dpkg warnings.
-  * debian/rules: use dh_python2 instead of py_support.
+  * debian/rules:
+    - use dh_python2 instead of py_support.
+    - remove build-stamp, use override_dh_auto_build to build samples.
 
  -- Guo Yixuan <culu.gyx at gmail.com>  Tue, 10 Jul 2012 23:21:13 +0800
 
diff --git a/debian/rules b/debian/rules
index 1e85c15..9353f90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -183,22 +183,9 @@ override_dh_auto_configure:
 update-boinc-applinks.1: debian/manpages/update-boinc-applinks.xml
 	docbook2x-man debian/manpages/update-boinc-applinks.xml
 
-
-samples/sleeper/sleeper: build-stamp samples/sleeper/sleeper.cpp
-	$(MAKE) -C samples/sleeper
-samples/worker/worker: build-stamp samples/worker/worker.cpp
-	$(MAKE) -C samples/worker
-samples/example_app/uc2: build-stamp samples/example_app/uc2.cpp
-	$(MAKE) -C samples/example_app
-samples/wrapper/wrapper: build-stamp samples/wrapper/wrapper.cpp
-	$(MAKE) -C samples/wrapper
-
-SAMPLES=samples/sleeper/sleeper samples/worker/worker samples/example_app/uc2 samples/wrapper/wrapper
-
-build:	build-stamp $(SAMPLES)
-build-stamp:
-	dh build --parallel --with python2
-	touch $@
+# use pattern rule for build
+# build:
+#	dh build --parallel --with python2
 
 override_dh_auto_build: update-boinc-applinks.1
 	@echo
@@ -218,6 +205,11 @@ override_dh_auto_build: update-boinc-applinks.1
 	  done; \
 	fi
 
+	$(MAKE) -C samples/sleeper
+	$(MAKE) -C samples/worker
+	$(MAKE) -C samples/example_app
+	$(MAKE) -C samples/wrapper
+
 BINARIES= sched/census sched/cgi sched/db_dump sched/db_purge \
 	sched/delete_file sched/feeder sched/file_deleter \
 	sched/file_upload_handler sched/get_file sched/make_work \
@@ -290,7 +282,9 @@ override_dh_auto_clean:
 	  packages/solaris/CSW/boincmanager/Makefile
 	debconf-updatepo
 
-override_dh_auto_install: update-boinc-applinks.1 $(SAMPLES)
+SAMPLES=samples/sleeper/sleeper samples/worker/worker samples/example_app/uc2 samples/wrapper/wrapper
+
+override_dh_auto_install: update-boinc-applinks.1
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 	mkdir -p $(CURDIR)/debian/tmp/samples
 	cp $(SAMPLES) $(CURDIR)/debian/tmp/samples
@@ -331,7 +325,7 @@ override_dh_fixperms:
 	  debian/boinc-client/usr/share/bug/boinc-client/script \
 	  debian/boinc-manager/usr/share/doc/boinc-manager/examples/run-boincmgr
 
-override_dh_install: $(SAMPLES)
+override_dh_install:
 	dh_install
 	rm -rf debian/boinc-manager/usr/share/locale/en_US/
 	# delete empty dirs
@@ -374,5 +368,5 @@ get-orig-source:
 	$$nice $$EXB -r $$VERSION -t $(origDir); \
 	rm -f $$EXB
 
-.PHONY: build clean install binary-arch binary get-orig-source
+.PHONY: clean install binary-arch binary get-orig-source
 

-- 
BOINC packaging