[boinc] 01/01: Adding gui_urls.xml to tools/ install

[Steffen Möller]

This is an automated email from the git hooks/post-receive script.

moeller pushed a commit to branch master
in repository boinc.

commit e8ed52870adb4863e2c12cff9e120e3363a93f94
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Sat Aug 31 23:57:10 2013 +0200

    Adding gui_urls.xml to tools/ install
    
    The additional library for file_upload_handler still
    needs to be specified correctly.
---
 debian/patches/dynamic_libboinc.patch              |    6 ++++--
 .../file_upload_handler_in_sched_linking.patch     |   22 ++++++++++++++++++++
 .../patches/gui_urls_xml_added_to_Makefile.patch   |   14 +++++++++++++
 debian/patches/series                              |    2 ++
 4 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/debian/patches/dynamic_libboinc.patch b/debian/patches/dynamic_libboinc.patch
index b0619ad..4f2ab4f 100644
--- a/debian/patches/dynamic_libboinc.patch
+++ b/debian/patches/dynamic_libboinc.patch
@@ -1,5 +1,7 @@
---- a/Makefile.incl
-+++ b/Makefile.incl
+Index: boinc_debian_new/Makefile.incl
+===================================================================
+--- boinc_debian_new.orig/Makefile.incl
++++ boinc_debian_new/Makefile.incl
 @@ -38,22 +38,22 @@
  # dependencies to make sure libs gets compiled before
  # programs linking to them:
diff --git a/debian/patches/file_upload_handler_in_sched_linking.patch b/debian/patches/file_upload_handler_in_sched_linking.patch
new file mode 100644
index 0000000..694c5e8
--- /dev/null
+++ b/debian/patches/file_upload_handler_in_sched_linking.patch
@@ -0,0 +1,22 @@
+Index: boinc_debian_new/sched/Makefile.am
+===================================================================
+--- boinc_debian_new.orig/sched/Makefile.am
++++ boinc_debian_new/sched/Makefile.am
+@@ -256,7 +256,7 @@
+ update_stats_LDADD = $(SERVERLIBS)
+ 
+ file_upload_handler_SOURCES = file_upload_handler.cpp
+-file_upload_handler_LDADD = $(SERVERLIBS)
++file_upload_handler_LDADD = $(SERVERLIBS) -lboinc
+ 
+ make_work_SOURCES = make_work.cpp
+ make_work_LDADD = $(SERVERLIBS)
+@@ -298,7 +298,7 @@
+     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 = $(SERVERLIBS_FCGI) -lboinc
+ 
+ endif
+ # end of "if ENABLE_FCGI"
diff --git a/debian/patches/gui_urls_xml_added_to_Makefile.patch b/debian/patches/gui_urls_xml_added_to_Makefile.patch
new file mode 100644
index 0000000..97af84c
--- /dev/null
+++ b/debian/patches/gui_urls_xml_added_to_Makefile.patch
@@ -0,0 +1,14 @@
+Index: boinc_debian_new/tools/Makefile.am
+===================================================================
+--- boinc_debian_new.orig/tools/Makefile.am
++++ boinc_debian_new/tools/Makefile.am
+@@ -34,7 +34,8 @@
+     watch_tcp
+ 
+ dist_tools_DATA = \
+-    project.xml
++    project.xml \
++    gui_urls.xml
+ 
+ AM_CXXFLAGS += $(MYSQL_CFLAGS)
+ AM_LDFLAGS += -static -L../sched -L../lib/.libs
diff --git a/debian/patches/series b/debian/patches/series
index 8b40b29..4c0d3f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -69,3 +69,5 @@ fix-android-build.patch
 fix-file-perms.patch
 fix-italian-po.patch
 addressing_addional_html_dirs.patch
+gui_urls_xml_added_to_Makefile.patch
+file_upload_handler_in_sched_linking.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git