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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 807e854ad73c994a8af3649e8578c1aecc7118df
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Tue Jul 16 00:49:00 2013 +0200

    adding_lpthread_and_ljpeg.patch accepted upstream

diff --git a/debian/patches/adding_lpthread_and_ljpeg.patch b/debian/patches/adding_lpthread_and_ljpeg.patch
deleted file mode 100644
index 9f7917c..0000000
--- a/debian/patches/adding_lpthread_and_ljpeg.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
- 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)
-+libboinc_graphics2_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -ljpeg
- endif #BUILD_GRAPHICS_API
- 
- lib_LTLIBRARIES += libboinc_opencl.la
diff --git a/debian/patches/series b/debian/patches/series
index 0f0e5f6..5c2be49 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -62,4 +62,3 @@ filesys_error_message.patch
 de.po.patch
 more_clang_warnings.patch
 #mmap_mem_only.patch
-adding_lpthread_and_ljpeg.patch #fixing FTBFS with saucy boinc-app-seti and boinc-app-milkyway

-- 
BOINC packaging