[Pkg-voip-commits] [pjproject] 35/45: Simplify d-shlibdeps call and instead tighten build-dependency on d-shlibs.

Jonas Smedegaard dr at jones.dk
Tue Jun 7 22:01:26 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 12ca8b918a0517240439fe382e253f8f407ee8ac
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Jun 7 16:48:21 2016 +0200

    Simplify d-shlibdeps call and instead tighten build-dependency on d-shlibs.
---
 debian/control | 2 +-
 debian/rules   | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 1b9d8b4..19fdd32 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  debhelper (>= 9.20160403~),
  dh-autoreconf,
  dh-python,
- d-shlibs,
+ d-shlibs (>= 0.71~),
  libavcodec-dev,
  libavdevice-dev,
  libavformat-dev,
diff --git a/debian/rules b/debian/rules
index dbedb93..432bce2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,14 +80,6 @@ override_dh_auto_install:
 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