[boinc] 02/02: Upload again to experimental, some new fixes

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to annotated tag debian/7.4.14+dfsg-2exp2
in repository boinc.

commit 32929a60f3a9ad3aef4fe447a86b035877658294
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Sep 1 10:31:36 2014 +0200

    Upload again to experimental, some new fixes
---
 debian/.gitignore                     | 23 +++++++++++++++++++++++
 debian/changelog                      | 12 ++++++++++++
 debian/patches/add-ldflags.patch      |  2 +-
 debian/patches/fix-dependencies.patch | 31 +++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 debian/rules                          |  5 +++++
 6 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..82b8b59
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,23 @@
+autoreconf.after
+autoreconf.before
+control
+files
+*.debhelper
+*.debhelper.log
+*.substvars
+tmp
+boinc
+boinc-amd-opencl
+boinc-app-examples
+boinc-cgi-stripchart
+boinc-client
+boinc-dbg
+boinc-dev
+boinc-manager
+boinc-nvidia-cuda
+boinc-server
+boinc-server-dbg
+boinc-server-maker
+libboinc-app-dev
+libboinc-app7
+libboinc7
diff --git a/debian/changelog b/debian/changelog
index 745c24e..47394da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+boinc (7.4.14+dfsg-2exp2) experimental; urgency=medium
+
+  * Correctly exporting LDFLAGS prior to add them.
+  * Move .gitignore to debian directory, to keep the delta from
+    upstream minimal.
+  * d/p/fix-dependencies.patch depending from a target rather than la
+    (to avoid race conditions between the "ln" and the use of the
+    static library)
+  * Remove double LDFLAG inclusion in add-ldflags.patch
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Sat, 30 Aug 2014 20:31:45 +0200
+
 boinc (7.4.14+dfsg-2exp1) experimental; urgency=medium
 
   * Upload to experimental, with the boinc-server-* packages.
diff --git a/debian/patches/add-ldflags.patch b/debian/patches/add-ldflags.patch
index 33a0dcd..d1e40da 100644
--- a/debian/patches/add-ldflags.patch
+++ b/debian/patches/add-ldflags.patch
@@ -5,4 +5,4 @@
  
  wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a $(REGEXP_OBJS)
 -	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) libstdc++.a $(PTHREAD) -lboinc_api -lboinc -lboinc_zip
-+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) libstdc++.a $(PTHREAD) -lboinc_api -lboinc -lboinc_zip $(LDFLAGS)
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) libstdc++.a $(PTHREAD) -lboinc_api -lboinc -lboinc_zip $(LDFLAGS)
diff --git a/debian/patches/fix-dependencies.patch b/debian/patches/fix-dependencies.patch
new file mode 100644
index 0000000..39992f4
--- /dev/null
+++ b/debian/patches/fix-dependencies.patch
@@ -0,0 +1,31 @@
+--- boinc-7.4.14+dfsg.orig/Makefile.incl
++++ boinc-7.4.14+dfsg/Makefile.incl
+@@ -43,22 +43,22 @@ AM_LDFLAGS =
+ 
+ LIBSCHED = $(top_builddir)/sched/libsched.la
+ $(LIBSCHED):
+-	cd $(top_builddir)/sched; ${MAKE} libsched.la
++	cd $(top_builddir)/sched; ${MAKE} libsched.a
+ LIBSCHED_FCGI = $(top_builddir)/sched/libsched_fcgi.la
+ $(LIBSCHED_FCGI):
+-	cd $(top_builddir)/sched; ${MAKE} libsched_fcgi.la
++	cd $(top_builddir)/sched; ${MAKE} libsched_fcgi.a
+ LIBBOINC = $(top_builddir)/lib/libboinc.la
+ $(LIBBOINC):
+-	cd $(top_builddir)/lib; ${MAKE} libboinc.la
++	cd $(top_builddir)/lib; ${MAKE} libboinc.a
+ LIBBOINC_CRYPT = $(top_builddir)/lib/libboinc_crypt.la
+ $(LIBBOINC_CRYPT):
+-	cd $(top_builddir)/lib; ${MAKE} libboinc_crypt.la
++	cd $(top_builddir)/lib; ${MAKE} libboinc_crypt.a
+ LIBBOINC_FCGI = $(top_builddir)/lib/libboinc_fcgi.la
+ $(LIBBOINC_FCGI):
+-	cd $(top_builddir)/lib; ${MAKE} libboinc_fcgi.la
++	cd $(top_builddir)/lib; ${MAKE} libboinc_fcgi.a
+ LIBAPI = $(top_builddir)/api/libboinc_api.la
+ $(LIBAPI):
+-	cd $(top_builddir)/api; ${MAKE} libboinc_api.la
++	cd $(top_builddir)/api; ${MAKE} libboinc_api.a
+ 
+ SERVERLIBS = $(LIBSCHED) $(LIBBOINC_CRYPT) $(LIBBOINC) $(MYSQL_LIBS) $(PTHREAD_LIBS) $(RSA_LIBS) $(SSL_LIBS)
+ SERVERLIBS_FCGI = $(LIBSCHED_FCGI) $(LIBBOINC_CRYPT) $(LIBBOINC_FCGI) -lfcgi $(MYSQL_LIBS) $(PTHREAD_LIBS) $(RSA_LIBS) $(SSL_LIBS)
diff --git a/debian/patches/series b/debian/patches/series
index 826b397..9c18b68 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,3 +39,4 @@ server_status_php.patch
 boinc-server-dynamic-libs.patch
 fix-typo.patch
 mv-md5.patch
+fix-dependencies.patch
diff --git a/debian/rules b/debian/rules
index 68e3913..8d9e83a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,11 @@
 #export CXX=/usr/lib/gcc-snapshot/bin/g++
 #export CPP=/usr/lib/gcc-snapshot/bin/cpp
 
+export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+export CFLAGS   := $(shell dpkg-buildflags --get CFLAGS)
+export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
+export LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS)
+
 #export CXX=clang++
 
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git