[Pkg-voip-commits] [janus] 01/02: Fix build-depend without negative arch-limiters on libsrtp0-dev.

Jonas Smedegaard dr at jones.dk
Sat Mar 25 16:51:36 UTC 2017


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

js pushed a commit to branch master
in repository janus.

commit c09a7d568a1150896a58de3bf2042d3c439211be
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Mar 25 17:41:07 2017 +0100

    Fix build-depend without negative arch-limiters on libsrtp0-dev.
---
 debian/control        | 2 +-
 debian/control-update | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 265f0bb..fcd1a3c 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends:
  librabbitmq-dev,
  libsofia-sip-ua-dev,
  libsrtp2-dev [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el],
- libsrtp0-dev (>= 1.5) [!amd64 !arm64 !armel !armhf !i386 !mips64el !mipsel !ppc64el],
+ libsrtp0-dev (>= 1.5) [hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips powerpc s390x],
  libssl-dev,
  libwebsockets-dev (>> 1.3),
  libavutil-dev,
diff --git a/debian/control-update b/debian/control-update
index f3531f1..37ce43d 100755
--- a/debian/control-update
+++ b/debian/control-update
@@ -17,10 +17,11 @@
 
 set -eu
 
-SRTP2=$(sh ./debian/pkgarchs.sh libsrtp2-dev)
-SRTP=$(echo "$SRTP2" | perl -pe 's/(\S+)/!$1/g')
+export ALL=$(sh debian/pkgarchs.sh base-files)
+export SRTP2=$(sh debian/pkgarchs.sh libsrtp2-dev)
+export SRTP=$(perl -mList::Compare -E '$lc = List::Compare->new( [split(" ", $ENV{"SRTP2"} )], [split( " ", $ENV{"ALL"} )] ); say join(" ", $lc->get_complement);') #'
 
 perl -pi \
-	-e "s/libsrtp2-dev(\s*\([^\)]*\))?\K[^,]*,/ [$SRTP2],/;" \
-	-e "s/libsrtp0-dev(\s*\([^\)]*\))?\K[^,]*,/ [$SRTP],/;" \
+	-e 's/libsrtp2-dev(\s*\([^\)]*\))?\K[^,]*,/ [$ENV{"SRTP2"}],/;' \
+	-e 's/libsrtp0-dev(\s*\([^\)]*\))?\K[^,]*,/ [$ENV{"SRTP"}],/;' \
 	debian/control

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



More information about the Pkg-voip-commits mailing list