[Pkg-voip-commits] [pjproject] 35/42: merge patched into master

[tzafrir at debian.org]

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

tzafrir pushed a commit to branch master-2.3
in repository pjproject.

commit 3415209c552d0918d04cb65f3b4a015c24b09b40
Merge: 7b1b825 7fb336c
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Fri Oct 31 23:16:12 2014 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...umber-of-libraries-linked-with-pjlib-util.patch | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 pjlib-util/build/Makefile                          |  2 +-
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 7713f9d,0000000..ac3a361
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- ca970e9849cd932fea5c3b27609b0dfba7d2c628
- ca970e9849cd932fea5c3b27609b0dfba7d2c628
++7fb336c5cf412a5edc516c752476b4c3b0f618ac
++7fb336c5cf412a5edc516c752476b4c3b0f618ac
 +0f2fb3560bfd7eccacf6e240a6a344e1dc266b2f
 +0f2fb3560bfd7eccacf6e240a6a344e1dc266b2f
 +pjproject_2.3~dfsg.orig.tar.bz2
 +5f73a3784e4d6c2e7300f583bab27bad3ec1ae48
 +4402101
diff --cc debian/patches/0006-Reduce-number-of-libraries-linked-with-pjlib-util.patch
index 0000000,0000000..4f90a00
new file mode 100644
--- /dev/null
+++ b/debian/patches/0006-Reduce-number-of-libraries-linked-with-pjlib-util.patch
@@@ -1,0 -1,0 +1,24 @@@
++From 7fb336c5cf412a5edc516c752476b4c3b0f618ac Mon Sep 17 00:00:00 2001
++From: Tzafrir Cohen <tzafrir at debian.org>
++Date: Fri, 31 Oct 2014 23:14:49 +0200
++Subject: Reduce number of libraries linked with pjlib-util
++
++The -util library hardly has any external library dependencies. Removing
++the external libs.
++---
++ pjlib-util/build/Makefile | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/pjlib-util/build/Makefile b/pjlib-util/build/Makefile
++index cb601cb..f89f62d 100644
++--- a/pjlib-util/build/Makefile
+++++ b/pjlib-util/build/Makefile
++@@ -29,7 +29,7 @@ export _CFLAGS 	:= $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
++ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
++ 		   $(HOST_CXXFLAGS) $(CXXFLAGS)
++ export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
++-		   $(APP_LDFLAGS) $(LDFLAGS)
+++		   $(APP_LDFLAGS)
++ 
++ ###############################################################################
++ # Defines for building PJLIB-UTIL library
diff --cc debian/patches/series
index 9f00882,0000000..3ec1260
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,6 @@@
 +0001-Remove-pointless-linking-with-libasound.patch
 +0002-Reduce-number-of-libraries-linked-with-pjlib.patch
 +0003-Reduce-number-of-libraries-linked-with-pjmedia.patch
 +0004-Enable-building-python-bindings.patch
 +0005-CODEC_ID_-changed-to-AV_CODEC_ID_.patch
++0006-Reduce-number-of-libraries-linked-with-pjlib-util.patch

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