[Pkg-voip-commits] [pjproject] 05/10: Migrate to libsrtp 2.x.x, add Breaks to old Asterisk

[Bernhard Schmidt]

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

berni pushed a commit to branch master
in repository pjproject.

commit 00be05fac566d0880ebd7317985b8205ed576627
Author: Bernhard Schmidt <berni at debian.org>
Date:   Thu Oct 5 23:03:24 2017 +0200

    Migrate to libsrtp 2.x.x, add Breaks to old Asterisk
    
    Asterisk compiled against libsrtp0 using pjproject linked with libsrtp2
    segfaults on SRTP use, add Breaks to libpjsip2 to ensure they are
    migrating together
---
 debian/control | 3 ++-
 debian/rules   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index c4ed69a..b1e7d3c 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
  liboss4-salsa-dev [kfreebsd-any],
  libsdl2-dev,
  libspeex-dev, libspeexdsp-dev,
- libsrtp-dev,
+ libsrtp2-dev,
  libssl-dev,
  libswscale-dev,
  libv4l-dev [!hurd-any],
@@ -152,6 +152,7 @@ Package: libpjsip2
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${misc:Pre-Depends}, ${shlibs:Depends}
+Breaks: asterisk (<< 1:13.17.2~dfsg-2~)
 Description: PJ Project - SIP handling library
  PJSIP (a.k.a PJProject) is a multimedia communication library written
  in C language implementing standard based protocols such as SIP, SDP,
diff --git a/debian/rules b/debian/rules
index 4506cf0..563479d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -86,6 +86,7 @@ override_dh_shlibdeps:
 	d-devlibdeps \
 	  --override 's/libopus0-dev/libopus-dev/' \
 	  --override 's/libvo-amrwbenc0-dev/libvo-amrwbenc-dev/' \
+	  --override 's/libsrtp2-1-dev/libsrtp2-dev/' \
 	  debian/libpjproject-dev.substvars debian/lib*/usr/lib/*/lib*.so.*
 
 .PHONY: build

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