[Pkg-voip-commits] [pjproject] 03/04: Resolve most libpjproject-dev dependencies during build. Build-depend on d-shlibs.

Jonas Smedegaard dr at jones.dk
Mon Mar 28 16:54:37 UTC 2016


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

js pushed a commit to branch master
in repository pjproject.

commit b9cb7c2075c52195acd8ef8c501c5796ab8109a1
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Mar 28 18:53:52 2016 +0200

    Resolve most libpjproject-dev dependencies during build. Build-depend on d-shlibs.
---
 debian/control | 18 +++---------------
 debian/rules   | 13 +++++++++++++
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/debian/control b/debian/control
index 6b24028..ccea184 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Uploaders: Jeremy Lainé <jeremy.laine at m4x.org>,
 Build-Depends: debhelper (>= 9),
  autotools-dev,
  python-dev,
+ d-shlibs,
  dh-python,
  dh-autoreconf,
  libspeex-dev, libspeexdsp-dev,
@@ -206,7 +207,7 @@ Package: libpjproject-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: ${misc:Depends}, ${misc:Pre-Depends}, ${shlibs:Depends},
+Depends: ${misc:Depends}, ${misc:Pre-Depends}, ${shlibs:Depends}, ${devlibs:Depends},
  libpjlib-util2 (= ${binary:Version}),
  libpjmedia-audiodev2 (= ${binary:Version}),
  libpjmedia-codec2 (= ${binary:Version}),
@@ -219,21 +220,8 @@ Depends: ${misc:Depends}, ${misc:Pre-Depends}, ${shlibs:Depends},
  libpjsua2 (= ${binary:Version}),
  libpjsua2-2v5 (= ${binary:Version}),
  libpj2 (= ${binary:Version}),
- libspeex-dev, libspeexdsp-dev,
- portaudio19-dev,
- libgsm1-dev,
- libopencore-amrnb-dev,
- libopencore-amrwb-dev,
- libavcodec-dev,
- libavformat-dev,
- libavutil-dev,
- libswscale-dev,
  libx264-dev,
- libv4l-dev,
- libsdl2-dev,
- uuid-dev,
- libsrtp0-dev,
- libssl-dev
+
 Description: PJ Project - development headers
  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 b482a6a..445fe22 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,4 +78,17 @@ override_dh_auto_install:
 	  mkdir -p $$new_dir; \
 	  mv $(headers) $$new_dir/
 
+override_dh_shlibdeps:
+	dh_shlibdeps
+	d-devlibdeps \
+	  --override 's/libopencore-\(amr[nw]b\)[0-9]\+-dev/libopencore-\1-dev/' \
+	  --override 's/libSDL2-[0-9.-]\+-dev/libsdl2-dev/' \
+	  --override 's/lib\(avcodec\|avformat\|avutil\|swscale\)-ffmpeg[0-9]\+-dev/lib\1-dev/' \
+	  --override 's/libpj\(\|lib-util\|media\(\|-audiodev\|-codec\|-videodev\)\|nath\|sip\(\|-simple\|-ua\)\|sua\)2-dev/libpjproject-dev/' \
+	  --override 's/libportaudio2-dev/portaudio19-dev/' \
+	  --override 's/libspeexdsp1-dev/libspeexdsp-dev/' \
+	  --override 's/libv4l2-0-dev/libv4l-dev/' \
+	  --override 's/libsrtp0/libsrtp/' \
+	  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



More information about the Pkg-voip-commits mailing list