[SCM] BOINC packaging branch, SZTAKI, updated. debian/6.10.17+dfsg-3-333-g8b1d2e4

Sat Jun 18 23:25:05 UTC 2011

The following commit has been merged in the SZTAKI branch:
commit 8b1d2e401293e6aa4955ffdd8cdbb31e8fd11227
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Jun 19 01:24:24 2011 +0200

    More on Makefiles.

diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index cc37670..86f79ac 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -1,19 +1,5 @@
 --- boinc-server-6.11.0+r18946.orig/Makefile.am
 +++ boinc-server-6.11.0+r18946/Makefile.am
-@@ -9,11 +9,11 @@
- ACLOCAL_AMFLAGS = -I m4
- 
- if ENABLE_LIBRARIES
--   API_SUBDIRS = api lib
-+   API_SUBDIRS = lib api
- endif
- 
- if ENABLE_SERVER
--   SERVER_SUBDIRS = db test py sched apps tools samples/example_app
-+   SERVER_SUBDIRS = db test py sched apps tools
- endif
- 
- if ENABLE_CLIENT
 @@ -37,6 +37,12 @@
  	stripchart                                  \
      INSTALL										
diff --git a/debian/patches/local_sztaki_simplifyMakefileSched.patch b/debian/patches/local_sztaki_simplifyMakefileSched.patch
index 11786e0..1894978 100644
--- a/debian/patches/local_sztaki_simplifyMakefileSched.patch
+++ b/debian/patches/local_sztaki_simplifyMakefileSched.patch
@@ -1,7 +1,7 @@
 Index: boinc/sched/Makefile.am
 ===================================================================
 --- boinc.orig/sched/Makefile.am	2011-06-14 01:10:50.000000000 +0200
-+++ boinc/sched/Makefile.am	2011-06-14 01:13:29.000000000 +0200
++++ boinc/sched/Makefile.am	2011-06-14 01:18:09.000000000 +0200
 @@ -4,7 +4,8 @@
  include $(top_srcdir)/Makefile.incl
  
@@ -34,3 +34,133 @@ Index: boinc/sched/Makefile.am
  
  endif
  # end of "if ENABLE_FCGI"
+@@ -124,6 +125,8 @@
+ # scripts that 'make install' should put in bindir
+ bin_SCRIPTS = start stop status
+ 
++dist_data_DATA = db_dump_spec.xml
++
+ noinst_HEADERS = \
+     assimilate_handler.h \
+     handle_request.h \
+@@ -161,33 +164,26 @@
+     time_stats_log.cpp
+ 
+ cgi_SOURCES = $(cgi_sources)
+-cgi_LDADD = $(SERVERLIBS)
+ 
+ census_SOURCES = \
+     census.cpp \
+     hr.cpp \
+     hr_info.cpp
+-census_LDADD = $(SERVERLIBS)
+ 
+ credit_test_SOURCES = \
+ 	credit_test.cpp
+-credit_test_LDADD = $(SERVERLIBS)
+ 
+ feeder_SOURCES = \
+     feeder.cpp \
+     hr.cpp \
+     hr_info.cpp \
+     ../lib/synch.cpp
+-feeder_LDADD = $(SERVERLIBS)
+ 
+ wu_check_SOURCES = wu_check.cpp
+-wu_check_LDADD = $(SERVERLIBS)
+ 
+ show_shmem_SOURCES = show_shmem.cpp
+-show_shmem_LDADD = $(SERVERLIBS)
+ 
+ file_deleter_SOURCES = file_deleter.cpp
+-file_deleter_LDADD = $(SERVERLIBS)
+ 
+ VALIDATOR_SOURCES = \
+ 	credit.cpp \
+@@ -197,11 +193,9 @@
+ 
+ sample_bitwise_validator_SOURCES = $(VALIDATOR_SOURCES) \
+ 	sample_bitwise_validator.cpp 
+-sample_bitwise_validator_LDADD = $(SERVERLIBS)
+ 
+ sample_trivial_validator_SOURCES = $(VALIDATOR_SOURCES) \
+ 	sample_trivial_validator.cpp
+-sample_trivial_validator_LDADD = $(SERVERLIBS)
+ 
+ ASSIMILATOR_SOURCES = \
+ 	assimilator.cpp \
+@@ -209,57 +203,40 @@
+ 
+ sample_dummy_assimilator_SOURCES = $(ASSIMILATOR_SOURCES) \
+ 	sample_dummy_assimilator.cpp
+-sample_dummy_assimilator_LDADD = $(SERVERLIBS)
+ 
+ sample_assimilator_SOURCES = $(ASSIMILATOR_SOURCES) \
+ 	sample_assimilator.cpp
+-sample_assimilator_LDADD = $(SERVERLIBS)
+ 
+ single_job_assimilator_SOURCES = $(ASSIMILATOR_SOURCES) \
+ 	single_job_assimilator.cpp
+-single_job_assimilator_LDADD = $(SERVERLIBS)
+ 
+ sample_work_generator_SOURCES = sample_work_generator.cpp
+-sample_work_generator_LDADD = $(SERVERLIBS)
+ 
+ db_dump_SOURCES = db_dump.cpp
+-db_dump_LDADD = $(SERVERLIBS)
+ 
+ db_purge_SOURCES = db_purge.cpp
+-db_purge_LDADD = $(SERVERLIBS)
+ 
+ trickle_handler_SOURCES = trickle_handler.cpp
+-trickle_handler_LDADD = $(SERVERLIBS)
+ 
+ update_stats_SOURCES = update_stats.cpp
+-update_stats_LDADD = $(SERVERLIBS)
+ 
+ file_upload_handler_SOURCES = file_upload_handler.cpp
+-file_upload_handler_LDADD = $(SERVERLIBS)
+ 
+ make_work_SOURCES = make_work.cpp
+-make_work_LDADD = $(SERVERLIBS)
+ 
+ transitioner_SOURCES = transitioner.cpp
+-transitioner_LDADD = $(SERVERLIBS)
+ 
+ message_handler_SOURCES = message_handler.cpp
+-message_handler_LDADD = $(SERVERLIBS)
+ 
+ request_file_list_SOURCES = request_file_list.cpp
+-request_file_list_LDADD = $(SERVERLIBS)
+ 
+ get_file_SOURCES = get_file.cpp
+-get_file_LDADD = $(SERVERLIBS)
+ 
+ send_file_SOURCES = send_file.cpp
+-send_file_LDADD = $(SERVERLIBS)
+ 
+ delete_file_SOURCES = delete_file.cpp
+-delete_file_LDADD = $(SERVERLIBS)
+ 
+ sched_driver_SOURCES = sched_driver.cpp
+-sched_driver_LDADD = $(SERVERLIBS)
+ 
+ if ENABLE_FCGI
+ 
+@@ -268,14 +245,14 @@
+ 
+ fcgi_SOURCES = $(cgi_sources)
+ fcgi_CPPFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
+-fcgi_LDADD = $(SERVERLIBS_FCGI)
++fcgi_LDADD = libsched_fcgi.la
+ 
+ fcgi_file_upload_handler_SOURCES = \
+     file_upload_handler.cpp \
+     sched_config.cpp \
+     sched_msgs.cpp 
+ fcgi_file_upload_handler_CPPFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
+-fcgi_file_upload_handler_LDADD = $(SERVERLIBS_FCGI)
++fcgi_file_upload_handler_LDADD = libsched_fcgi.la
+ 
+ endif
+ # end of "if ENABLE_FCGI"
diff --git a/debian/patches/reorderTopMakefileTargets.patch b/debian/patches/reorderTopMakefileTargets.patch
new file mode 100644
index 0000000..708d0f9
--- /dev/null
+++ b/debian/patches/reorderTopMakefileTargets.patch
@@ -0,0 +1,18 @@
+Index: boinc/Makefile.am
+===================================================================
+--- boinc.orig/Makefile.am	2011-06-19 01:23:46.000000000 +0200
++++ boinc/Makefile.am	2011-06-19 01:23:58.000000000 +0200
+@@ -9,11 +9,11 @@
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ if ENABLE_LIBRARIES
+-   API_SUBDIRS = api lib
++   API_SUBDIRS = lib api
+ endif
+ 
+ if ENABLE_SERVER
+-   SERVER_SUBDIRS = db test py sched apps tools samples/example_app
++   SERVER_SUBDIRS = db test py sched apps tools
+ endif
+ 
+ if ENABLE_CLIENT
diff --git a/debian/patches/series b/debian/patches/series
index 91a904b..6f3b163 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+reorderTopMakefileTargets.patch
 local_sztaki_addFilesToMakefileTools.patch
 local_sztaki_simplifyMakefileTools.patch
 local_sztaki_simplifyMakefileSched.patch

-- 
BOINC packaging

