[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 436f6b7458b68da392221b34b6f350c688851847
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Tue Jul 16 00:25:36 2013 +0200

    Soon to be addressed by upstream.

diff --git a/debian/patches/build_wrapper_in_regular_build_A.patch b/debian/patches/build_wrapper_in_regular_build_A.patch
deleted file mode 100644
index 73d6506..0000000
--- a/debian/patches/build_wrapper_in_regular_build_A.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: boinc_debian_new/Makefile.am
-===================================================================
---- boinc_debian_new.orig/Makefile.am
-+++ boinc_debian_new/Makefile.am
-@@ -16,7 +16,7 @@
- endif
- 
- if ENABLE_SERVER
--   SERVER_SUBDIRS = db test py sched apps tools vda html
-+   SERVER_SUBDIRS = db test py sched apps tools vda html samples
- ## once contained samples/example_app which breaks out-of-source-tree builds
- endif
- 
-@@ -33,7 +33,7 @@
- 
- # ORDER MATTERS below.  One must build dependencies FIRST, then things
- # that depend on them later
--SUBDIRS = m4 $(API_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS) $(CLIENTGUI_SUBDIRS) doc
-+SUBDIRS = m4 $(API_SUBDIRS) $(CLIENT_SUBDIRS) $(CLIENTGUI_SUBDIRS) $(SERVER_SUBDIRS) doc
- 
- # Putting a directory name recursively copies the entire contents - the
- # dist-hook below gets rid of CVS directories.
-Index: boinc_debian_new/samples/Makefile.am
-===================================================================
---- /dev/null
-+++ boinc_debian_new/samples/Makefile.am
-@@ -0,0 +1 @@
-+SUBDIRS=wrapper
diff --git a/debian/patches/build_wrapper_in_regular_build_B.patch b/debian/patches/build_wrapper_in_regular_build_B.patch
deleted file mode 100644
index 525d126..0000000
--- a/debian/patches/build_wrapper_in_regular_build_B.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: boinc_debian/samples/wrapper/Makefile.am
-===================================================================
---- /dev/null
-+++ boinc_debian/samples/wrapper/Makefile.am
-@@ -0,0 +1,25 @@
-+## -*- mode: makefile; tab-width: 4 -*-
-+## $Id$
-+
-+include $(top_srcdir)/Makefile.incl
-+
-+exampledir = $(prefix)/lib/boinc-apps-examples
-+example_PROGRAMS = wrapper
-+
-+BOINC_API_DIR = $(top_srcdir)/api
-+BOINC_LIB_DIR = $(top_srcdir)/lib
-+BOINC_ZIP_DIR = $(top_srcdir)/zip
-+
-+libstdc++.a:
-+	ln -s `g++ -print-file-name=libstdc++.a`
-+-REGEXP_OBJS = \
-+-       regexp.o \
-+-       regsub.o \
-+-       regerror.o \
-+-       regexp_memory.o \
-+-       regexp_report.o
-+
-+wrapper_SOURCES = regerror.c regexp.c regexp_custom.h regexp_memory.c regexp_report.c regsub.c wrapper.cpp
-+wrapper_CXXFLAGS = $(PTHREAD_CFLAGS) -g -O0 -Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -fno-common -I$(BOINC_API_DIR) -I$(BOINC_LIB_DIR) -I$(BOINC_ZIP_DIR)
-+wrapper_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS) -L$(BOINC_API_DIR)/.libs -L$(BOINC_LIB_DIR)/.libs -L$(BOINC_ZIP_DIR)/.libs -L.
-+wrapper_LDADD = $(APPLIBS)
diff --git a/debian/patches/series b/debian/patches/series
index 0011c6c..0f0e5f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -63,5 +63,3 @@ 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
-#build_wrapper_in_regular_build_A.patch
-#build_wrapper_in_regular_build_B.patch

-- 
BOINC packaging