[SCM] BOINC packaging branch, master, updated. upstream/7.0.46+dfsg-636-g160a181

Gianfranco Costamagna costamagnagianfranco at yahoo.it
Tue Jan 29 22:48:29 UTC 2013


The following commit has been merged in the master branch:
commit 160a1814be0bfe6aaa7f8c5537124e22c203804d
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Jan 29 23:48:17 2013 +0100

    Patch refresh

diff --git a/debian/changelog b/debian/changelog
index a8b4bf5..96f21e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+boinc (7.0.46+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Tue, 29 Jan 2013 23:46:33 +0100
+
 boinc (7.0.45+dfsg-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/patches/boinclib_shared.patch b/debian/patches/boinclib_shared.patch
index fcf4f6a..fdffc7c 100644
--- a/debian/patches/boinclib_shared.patch
+++ b/debian/patches/boinclib_shared.patch
@@ -9,8 +9,8 @@
  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_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CFLAGS)
+ libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS)
 -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++
@@ -28,7 +28,7 @@
  parse_test_LDADD = $(LIBBOINC)
 --- a/client/Makefile.am
 +++ b/client/Makefile.am
-@@ -90,7 +90,7 @@
+@@ -91,7 +91,7 @@
  if OS_DARWIN
  boinc_client_LDFLAGS += -Wl,-flat_namespace,-undefined,dynamic_lookup
  endif
diff --git a/debian/patches/clang_incompatibilities.patch b/debian/patches/clang_incompatibilities.patch
index 714b714..037443c 100644
--- a/debian/patches/clang_incompatibilities.patch
+++ b/debian/patches/clang_incompatibilities.patch
@@ -10,8 +10,8 @@ Description: Tested compatibility with clang.
 +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_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CFLAGS)
+ libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS)
  libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION)
 -libboinc_crypt_la_LIBADD = 
 +libboinc_crypt_la_LIBADD =  -lm -lstdc++

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list