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

[Gianfranco Costamagna]

The following commit has been merged in the master branch:
commit 21de46c0d4825184498f2d5f6bc6de5b3bfd1239
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Oct 12 13:29:24 2012 +0200

    Little changes in patch order
    	modified:   debian/changelog
    	modified:   debian/patches/boinclib_shared.patch
    	modified:   debian/patches/clang_incompatibilities.patch
    	modified:   debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index 3412bc5..06b6295 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 boinc (7.0.36+dfsg-2) UNRELEASED; urgency=low
 
+  [ Guo Yixuan ]
   * Removed some old patches (those not in series anymore).
   * Removed the deprecated DMUA field from debian/control.
 
- -- Guo Yixuan <culu.gyx at gmail.com>  Sun, 23 Sep 2012 00:10:12 +0800
+  [ Gianfranco Costamagna ]
+  * without boinclib_shared.patch boinc FTBFS, changed the order of patch
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 12 Oct 2012 13:26:54 +0200
 
 boinc (7.0.36+dfsg-1) unstable; urgency=low
 
diff --git a/debian/patches/boinclib_shared.patch b/debian/patches/boinclib_shared.patch
index 275ba8b..7a7d367 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 = -lm -lstdc++
- 
+ libboinc_la_LIBADD =
+
  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 =  -lm -lstdc++
- 
+ libboinc_crypt_la_LIBADD = 
+
  
 @@ -218,7 +218,7 @@
  msg_test_LDADD = $(LIBBOINC)
diff --git a/debian/patches/clang_incompatibilities.patch b/debian/patches/clang_incompatibilities.patch
index e3458f9..c0c85bd 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) -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++
  
diff --git a/debian/patches/series b/debian/patches/series
index fae66d4..3129e09 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 # patches to get Debian going
 libnotify-0.7.patch
+boinclib_shared.patch
 # undisputed patches above
 sched_driver_f_free.patch
 sched_driver_char_buffers.patch
@@ -55,7 +56,6 @@ unlink_undefined.patch
 0002-re-enable-X11-screensaver-build.patch
 screen_saver_boinc_extra.patch
 #socklenBuildFixByDavid.patch
-boinclib_shared.patch
 dynamic_libboinc.patch
 ensure_there_is_no_newline_in_passwd.patch
 Missing_libSched.patch

-- 
BOINC packaging