[Pkg-voip-commits] [janus] 01/07: Build-depend on libsrtp2-dev for all archs, with libsrtp0-dev as fallback (not only on libsrtp0-dev for some archs).

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository janus.

commit 416364be35c16ccb9c5a5c5ab29295c72be2d565
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Jun 12 16:26:19 2017 +0200

    Build-depend on libsrtp2-dev for all archs, with libsrtp0-dev as fallback (not only on libsrtp0-dev for some archs).
---
 debian/control        |  6 ++----
 debian/control-update | 27 --------------------------
 debian/pkgarchs.sh    | 52 ---------------------------------------------------
 3 files changed, 2 insertions(+), 83 deletions(-)

diff --git a/debian/control b/debian/control
index fcd1a3c..3192699 100644
--- a/debian/control
+++ b/debian/control
@@ -22,8 +22,7 @@ Build-Depends:
  libopus-dev,
  librabbitmq-dev,
  libsofia-sip-ua-dev,
- libsrtp2-dev [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el],
- libsrtp0-dev (>= 1.5) [hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips powerpc s390x],
+ libsrtp2-dev | libsrtp0-dev,
  libssl-dev,
  libwebsockets-dev (>> 1.3),
  libavutil-dev,
@@ -73,8 +72,7 @@ Depends:
  libglib2.0-dev,
  libjansson-dev,
  libnice-dev,
- libsrtp2-dev [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el],
- libssl-dev,
+ libsrtp2-dev | libsrtp0-dev,
 Suggests:
  janus-doc,
 Description: general purpose WebRTC gateway - development files
diff --git a/debian/control-update b/debian/control-update
deleted file mode 100755
index 37ce43d..0000000
--- a/debian/control-update
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-# Copyright © 2017  Jonas Smedegaard <dr at jones.dk>
-# Description: helper script to update copyright_hints
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-set -eu
-
-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[^,]*,/ [$ENV{"SRTP2"}],/;' \
-	-e 's/libsrtp0-dev(\s*\([^\)]*\))?\K[^,]*,/ [$ENV{"SRTP"}],/;' \
-	debian/control
diff --git a/debian/pkgarchs.sh b/debian/pkgarchs.sh
deleted file mode 100644
index c8f4270..0000000
--- a/debian/pkgarchs.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-#
-# Copyright © 2008, 2013-2014 Jonas Smedegaard <dr at jones.dk>
-# Description: Resolves supported archs of a Debian package
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-#
-# Depends: devscripts liburi-perl curl ca-certificates
-
-set -e
-
-defaultsuite="unstable"
-currentsuite="`dpkg-parsechangelog | grep ^Distribution: | awk '{print $2}'`"
-
-pkg="$1"
-suite="${2:-$currentsuite}"
-
-case "$suite" in
-    experimental)
-	suite="unstable,experimental"
-	;;
-    UNRELEASED|"")
-	echo >&2 "WARNING: bad suite \"$suite\", using \"$defaultsuite\" instead."
-	suite="$defaultsuite"
-	;;
-    *-*)
-	suite="$(echo "$suite" | sed -e 's/-.*//')"
-	;;
-esac
-
-echo >&2 "INFO: Resolving architectures for package \"$pkg\" through rmadison Internet request."
-dump="$(rmadison -s "$suite" "$pkg")"
-archs="$(echo "$dump" \
-	| awk -F'|' '{ print $4 }' \
-	| sed 's/source,//;s/ //g;s/,/\n/g' \
-	| LANG=C sort -u \
-	| tr '\n' ' ' \
-	| sed 's/^ //;s/ $/\n/;s/\ball\b/any/')"
-echo "${archs:-none}"

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