[boinc] 04/04: And experimental again, with some patches dropped

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch master
in repository boinc.

commit 8fd2c9f4223999cecc5fbd659834329eef3c92fe
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Sep 1 16:42:06 2014 +0200

    And experimental again, with some patches dropped
---
 debian/changelog                                          | 10 ++++++++++
 debian/patches/Missing_libSched.patch                     |  2 +-
 debian/patches/boinc-server-dynamic-libs.patch            |  4 ++--
 debian/patches/boinclib_shared.patch                      |  2 +-
 debian/patches/file_upload_handler_in_sched_linking.patch |  4 ++--
 debian/patches/gui_urls_xml_added_to_Makefile.patch       |  2 +-
 debian/patches/series                                     |  4 ++--
 debian/rules                                              |  4 +---
 8 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 27bb152..d105d6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+boinc (7.4.18+dfsg-1exp1) experimental; urgency=medium
+
+  * Upload to experimental, with the boinc-server-* packages.
+  * Disable no-add-needed LDFLAG.
+  * Attempt to disable termios_is_everywhere.patch and
+    upstream_sztaki_configureEval.patch
+  * Patch tweaks and refresh.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Mon, 01 Sep 2014 16:20:15 +0200
+
 boinc (7.4.18+dfsg-1) unstable; urgency=medium
 
   * Upload to unstable.
diff --git a/debian/patches/Missing_libSched.patch b/debian/patches/Missing_libSched.patch
index 156a147..09548dd 100644
--- a/debian/patches/Missing_libSched.patch
+++ b/debian/patches/Missing_libSched.patch
@@ -5,7 +5,7 @@
  
  AM_CXXFLAGS += $(MYSQL_CFLAGS)
 -AM_LDFLAGS += -static
-+AM_LDFLAGS += -static -L../sched -L../lib/.libs
++AM_LDFLAGS += -static -L../lib/.libs -L../sched
  
  cancel_jobs_SOURCES = cancel_jobs.cpp
  cancel_jobs_LDADD = $(SERVERLIBS)
diff --git a/debian/patches/boinc-server-dynamic-libs.patch b/debian/patches/boinc-server-dynamic-libs.patch
index 8e516a4..ffc7ebc 100644
--- a/debian/patches/boinc-server-dynamic-libs.patch
+++ b/debian/patches/boinc-server-dynamic-libs.patch
@@ -15,8 +15,8 @@
      gui_urls.xml
  
  AM_CXXFLAGS += $(MYSQL_CFLAGS)
--AM_LDFLAGS += -static -L../sched -L../lib/.libs
-+AM_LDFLAGS += -L../sched -L../lib/.libs
+-AM_LDFLAGS += -static -L../lib/.libs -L../sched
++AM_LDFLAGS += -L../lib/.libs -L../sched
  
  cancel_jobs_SOURCES = cancel_jobs.cpp
  cancel_jobs_LDADD = $(SERVERLIBS)
diff --git a/debian/patches/boinclib_shared.patch b/debian/patches/boinclib_shared.patch
index 651bd36..36314f0 100644
--- a/debian/patches/boinclib_shared.patch
+++ b/debian/patches/boinclib_shared.patch
@@ -21,7 +21,7 @@
  crypt_prog_SOURCES = crypt_prog.cpp 
  crypt_prog_CXXFLAGS = $(PTHREAD_CFLAGS)
 -crypt_prog_LDADD = $(LIBBOINC_CRYPT_STATIC) $(LIBBOINC) $(SSL_LIBS) 
-+crypt_prog_LDADD = $(LIBBOINC_CRYPT_STATIC) -L../lib/.libs $(LIBBOINC) $(SSL_LIBS)
++crypt_prog_LDADD = -L../lib/.libs $(LIBBOINC_CRYPT_STATIC) $(LIBBOINC) $(SSL_LIBS)
  parse_test_SOURCES = parse_test.cpp 
  parse_test_CXXFLAGS = $(PTHREAD_CFLAGS)
  parse_test_LDADD = $(LIBBOINC)
diff --git a/debian/patches/file_upload_handler_in_sched_linking.patch b/debian/patches/file_upload_handler_in_sched_linking.patch
index c1f855a..9316a66 100644
--- a/debian/patches/file_upload_handler_in_sched_linking.patch
+++ b/debian/patches/file_upload_handler_in_sched_linking.patch
@@ -5,7 +5,7 @@
  
  file_upload_handler_SOURCES = file_upload_handler.cpp sched_msgs.cpp sched_config.cpp sched_util_basic.cpp sched_limit.cpp
 -file_upload_handler_LDADD = $(FUHLIBS)
-+file_upload_handler_LDADD = $(FUHLIBS) -lboinc
++file_upload_handler_LDADD = $(FUHLIBS) $(LIBBOINC)
  
  make_work_SOURCES = make_work.cpp
  make_work_LDADD = $(SERVERLIBS)
@@ -14,7 +14,7 @@
      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
++fcgi_file_upload_handler_LDADD = $(SERVERLIBS_FCGI) $(LIBBOINC)
  
  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
index 9340813..021286c 100644
--- a/debian/patches/gui_urls_xml_added_to_Makefile.patch
+++ b/debian/patches/gui_urls_xml_added_to_Makefile.patch
@@ -9,4 +9,4 @@
 +    gui_urls.xml
  
  AM_CXXFLAGS += $(MYSQL_CFLAGS)
- AM_LDFLAGS += -static -L../sched -L../lib/.libs
+ AM_LDFLAGS += -static -L../lib/.libs -L../sched
diff --git a/debian/patches/series b/debian/patches/series
index 812c474..c980e04 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,9 @@
 # patches to get Debian going
 make_project_overcomes_Apache24_security.patch
 # undisputed patches above
-termios_is_everywhere.patch
+#termios_is_everywhere.patch
 stripchart_debian.patch
-upstream_sztaki_configureEval.patch
+#upstream_sztaki_configureEval.patch
 disable_svn_version.patch
 possible_size_type_error.patch
 debian_debian_AdjustBoincTopdirPython.patch
diff --git a/debian/rules b/debian/rules
index 7c4fe98..158676c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -118,9 +118,7 @@ endif
 
 CFLAGS += -Wall
 CXXFLAGS += -Wall
-#LDFLAGS += -Wl,--as-needed
-# hurd needs the following
-LDFLAGS += -Wl,--no-add-needed
+LDFLAGS += -Wl,--as-needed
 
 ifeq (,$(DEB_OPT_FLAGS))
    DEB_OPT_FLAGS = -O3 -funroll-loops -fforce-addr -ffast-math

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