[SCM] BOINC packaging branch, master, updated. debian/7.1.21+dfsg-1_exp1

[Gianfranco Costamagna]

The following commit has been merged in the master branch:
commit c42da3c671d182dab3788b19babb7ff0ff7dd052
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu Jun 27 14:50:07 2013 +0200

    New upstream release, fixed FTBFS

diff --git a/debian/changelog b/debian/changelog
index aeeb3ac..f155114 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+boinc (7.1.21+dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added adding_lpthread_and_ljpeg.patch to fix a FTBFS
+    with ubuntu saucy.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Thu, 27 Jun 2013 14:49:00 +0200
+
 boinc (7.1.20+dfsg-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/adding_lpthread_and_ljpeg.patch b/debian/patches/adding_lpthread_and_ljpeg.patch
index ed31da3..9f7917c 100644
--- a/debian/patches/adding_lpthread_and_ljpeg.patch
+++ b/debian/patches/adding_lpthread_and_ljpeg.patch
@@ -1,16 +1,14 @@
---- boinc-7.1.20+dfsg.orig/api/Makefile.am
-+++ boinc-7.1.20+dfsg/api/Makefile.am
-@@ -36,7 +36,7 @@ endif
-
+--- a/api/Makefile.am
++++ b/api/Makefile.am
+@@ -36,13 +36,13 @@
+ 
  lib_LTLIBRARIES = libboinc_api.la
  libboinc_api_la_SOURCES = $(api_files)
 -libboinc_api_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
 +libboinc_api_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -lpthread
-
+ 
  if BUILD_GRAPHICS_API
  lib_LTLIBRARIES += libboinc_graphics2.la
-@@ -42,7 +42,7 @@ if BUILD_GRAPHICS_API
- lib_LTLIBRARIES += libboinc_graphics2.la
  libboinc_graphics2_la_SOURCES = $(graphics2_files)
  # libboinc_graphics2_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib
 -libboinc_graphics2_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
diff --git a/debian/patches/nvidia_mem_display_simplification.patch b/debian/patches/nvidia_mem_display_simplification.patch
index ff88529..c05de93 100644
--- a/debian/patches/nvidia_mem_display_simplification.patch
+++ b/debian/patches/nvidia_mem_display_simplification.patch
@@ -1,6 +1,6 @@
 --- a/lib/coproc.cpp
 +++ b/lib/coproc.cpp
-@@ -529,7 +529,7 @@
+@@ -563,7 +563,7 @@
      cuda_version = 0;
      display_driver_version = 0;
      strcpy(prop.name, "");
@@ -9,7 +9,7 @@
      prop.sharedMemPerBlock = 0;
      prop.regsPerBlock = 0;
      prop.warpSize = 0;
-@@ -559,7 +559,7 @@
+@@ -593,7 +593,7 @@
      while (!xp.get_tag()) {
          if (xp.match_tag("/coproc_cuda")) {
              if (!peak_flops) {

-- 
BOINC packaging