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

Gianfranco Costamagna costamagnagianfranco at yahoo.it
Mon Dec 10 16:24:12 UTC 2012


The following commit has been merged in the master branch:
commit bd462d58ccf592e0e04a6f27a32c494fd33c55d9
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Dec 10 17:23:02 2012 +0100

    Removed put_file warning, added rm config.log in clean script and commented a line on server-maker

diff --git a/debian/boinc-server-maker.install b/debian/boinc-server-maker.install
index 27cf581..2f63131 100644
--- a/debian/boinc-server-maker.install
+++ b/debian/boinc-server-maker.install
@@ -12,7 +12,7 @@ sched/db_dump_spec.xml               usr/share/boinc-server/sched
 sched/transitioner_catchup.php	     usr/share/boinc-server/sched
 #where is this?
 #sched/request_file_list 	     usr/share/boinc-server/sched 
-sched/put_file 			     usr/lib/boinc-server/sched
+#sched/put_file			     usr/lib/boinc-server/sched
 
 #test/uc_result                      usr/share/boinc-server/test
 #test/uc_wu_nodelete                 usr/share/boinc-server/test
diff --git a/debian/rules b/debian/rules
index d5c6701..939d1d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -180,6 +180,7 @@ CFGFLAGS_boinc-client = \
 
 override_dh_clean:
 	dh_clean
+	rm -rf config.log
 	rm -rf clientscr/.libs override_dh_auto_install
 	rm -rf debian/boinc-app-examples debian/boinc-server-maker debian/boinc-app-examples.substvars debian/boinc-server-maker.substvars
 	rm -rf debian/tmp autoreconf-stamp build-*-stamp install-*-stamp
@@ -338,7 +339,7 @@ endif
 	do \
 		egrep -l "^#!.*env..*python" $$i/* | xargs -r sed -i '1s%#!.*%#!/usr/bin/python%' ; \
 	done
-	-chmod +x $(CURDIR)/debian/boinc-server-maker/usr/share/boinc-server/sched/transitioner_catchup.php ; \
+#	-chmod +x $(CURDIR)/debian/boinc-server-maker/usr/share/boinc-server/sched/transitioner_catchup.php ; \
 
 override_dh_install:
 	# boinc apps are built only together with the server

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list