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

[Gianfranco Costamagna]

The following commit has been merged in the master branch:
commit 29378fe4ccb3f985692576b58448b9b19cb3469b
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Oct 12 16:07:20 2012 +0200

    Reorder

diff --git a/debian/patches/boinclib_shared.patch b/debian/patches/boinclib_shared.patch
index 7a7d367..275ba8b 100644
--- a/debian/patches/boinclib_shared.patch
+++ b/debian/patches/boinclib_shared.patch
@@ -8,15 +8,15 @@ Index: boinc/lib/Makefile.am
  libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
 -libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION)
 +libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
- libboinc_la_LIBADD =
-
+ libboinc_la_LIBADD = -lm -lstdc++
+ 
  libboinc_crypt_la_SOURCES = crypt.cpp
  libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
  libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
 -libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION)
 +libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
- libboinc_crypt_la_LIBADD = 
-
+ libboinc_crypt_la_LIBADD =  -lm -lstdc++
+ 
  
 @@ -218,7 +218,7 @@
  msg_test_LDADD = $(LIBBOINC)
diff --git a/debian/patches/clang_incompatibilities.patch b/debian/patches/clang_incompatibilities.patch
index c0c85bd..e3458f9 100644
--- a/debian/patches/clang_incompatibilities.patch
+++ b/debian/patches/clang_incompatibilities.patch
@@ -7,14 +7,14 @@ Index: boinc/lib/Makefile.am
 @@ -147,13 +147,13 @@
  libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
  libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
- libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+ libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION)
 -libboinc_la_LIBADD =
 +libboinc_la_LIBADD = -lm -lstdc++
  
  libboinc_crypt_la_SOURCES = crypt.cpp
  libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
  libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
- libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+ libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION)
 -libboinc_crypt_la_LIBADD = 
 +libboinc_crypt_la_LIBADD =  -lm -lstdc++
  
diff --git a/debian/patches/series b/debian/patches/series
index a74f219..6bc4482 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 # patches to get Debian going
 libnotify-0.7.patch
-boinclib_shared.patch
 # undisputed patches above
 sched_driver_f_free.patch
 improve_opendir_warning.patch
@@ -63,9 +62,7 @@ sched_driver_char_buffers.patch
 csh2tcsh.patch
 
 #socklenBuildFixByDavid.patch
-dynamic_libboinc.patch
 ensure_there_is_no_newline_in_passwd.patch
-Missing_libSched.patch
 add_hardening_flags.patch
 cmath_missing.patch
 investigate_boinc_api.patch
@@ -75,3 +72,8 @@ opendir_errno.patch
 ticket_1168_verifycerts.patch
 better_makefiles.patch
 client_app_maxpathlen.patch
+#debian specific patches
+#boinclib_shared.patch is needed in order to make boinc build correctly otherwise it will FTBFS
+boinclib_shared.patch
+dynamic_libboinc.patch
+Missing_libSched.patch

-- 
BOINC packaging