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

[Steffen Moeller]

The following commit has been merged in the SZTAKI branch:
commit 5e6e25153352fb7973030c76d3abf776536b9aec
Author: Steffen Moeller <moeller at debian.org>
Date:   Tue Jun 14 01:07:30 2011 +0200

    Simplification of Makefile.am

diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index f608e68..5c917b1 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -446,30 +446,6 @@
 -crypt_prog_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT_STATIC) $(SSL_LIBS) 
 +crypt_prog_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT) $(SSL_LIBS)
  
---- boinc-server-6.11.0+r18946.orig/tools/Makefile.am
-+++ boinc-server-6.11.0+r18946/tools/Makefile.am
-@@ -21,17 +27,16 @@
- 		makelog.sh \
- 		run_in_ops
- 
-+dist_data_DATA = project.xml
-+
- AM_CXXFLAGS += $(MYSQL_CFLAGS)
--AM_LDFLAGS += -static
-+
-+LDADD = ../sched/libsched.la
- 
- create_work_SOURCES = create_work.cpp
--create_work_LDADD = $(SERVERLIBS)
- 
- sign_executable_SOURCES = sign_executable.cpp
--sign_executable_LDADD = $(SERVERLIBS)
- 
- dir_hier_path_SOURCES = dir_hier_path.cpp
--dir_hier_path_LDADD = $(SERVERLIBS)
- 
- dir_hier_move_SOURCES = dir_hier_move.cpp
--dir_hier_move_LDADD = $(SERVERLIBS)
 --- boinc-server-6.11.0+r18946.orig/tools/make_project
 +++ boinc-server-6.11.0+r18946/tools/make_project
 @@ -209,8 +204,8 @@
diff --git a/debian/patches/local_sztaki_simplifyMakefileTools.patch b/debian/patches/local_sztaki_simplifyMakefileTools.patch
new file mode 100644
index 0000000..a83fc2f
--- /dev/null
+++ b/debian/patches/local_sztaki_simplifyMakefileTools.patch
@@ -0,0 +1,26 @@
+Index: boinc/tools/Makefile.am
+===================================================================
+--- boinc.orig/tools/Makefile.am	2011-06-14 01:05:54.000000000 +0200
++++ boinc/tools/Makefile.am	2011-06-14 01:06:53.000000000 +0200
+@@ -27,17 +27,16 @@
+ 		makelog.sh \
+ 		run_in_ops
+ 
++dist_data_DATA = project.xml
++
+ AM_CXXFLAGS += $(MYSQL_CFLAGS)
+-AM_LDFLAGS += -static
++
++LDADD = ../sched/libsched.la
+ 
+ create_work_SOURCES = create_work.cpp
+-create_work_LDADD = $(SERVERLIBS)
+ 
+ sign_executable_SOURCES = sign_executable.cpp
+-sign_executable_LDADD = $(SERVERLIBS)
+ 
+ dir_hier_path_SOURCES = dir_hier_path.cpp
+-dir_hier_path_LDADD = $(SERVERLIBS)
+ 
+ dir_hier_move_SOURCES = dir_hier_move.cpp
+-dir_hier_move_LDADD = $(SERVERLIBS)
diff --git a/debian/patches/series b/debian/patches/series
index c3aa699..3132850 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 local_sztaki_addFilesToMakefileTools.patch
+local_sztaki_simplifyMakefileTools.patch
 local_sztaki_workOnTransitioner.patch
 local_sztaki_backendlib.patch
 upstream_sztaki_simplerInvocationCmdLine.patch

-- 
BOINC packaging