[Pkg-voip-commits] [ring] 01/02: Remove libiax due to copyright issues

[Alexandre Viau]

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

aviau pushed a commit to branch master
in repository ring.

commit c85e11ae8394761086004a71c0bd1499743c0a87
Author: aviau <alexandre at alexandreviau.net>
Date:   Thu Jun 30 14:44:43 2016 +0200

    Remove libiax due to copyright issues
---
 debian/README.Debian |  1 -
 debian/changelog     |  6 ++++++
 debian/copyright     | 54 +---------------------------------------------------
 debian/rules         |  2 +-
 4 files changed, 8 insertions(+), 55 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 1654bbc..7975a92 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -14,7 +14,6 @@
 
 We need those tarballs in tarballs-unpacked.
 The rest should be excluded.
- - iax-git.tar.gz
  - msgpack-c-cpp-1.2.0.tar.gz
  - opendht-281b62dfd529a226e94d0da19e01acf07871a797.tar.gz
  - pjproject-2.4.5.tar.bz2
diff --git a/debian/changelog b/debian/changelog
index c12c377..506cdb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ring (20160422.1.3c07c8e~dfsg2-1) UNRELEASED; urgency=medium
+
+  * Remove libiax due to copyright issues
+
+ -- Alexandre Viau <aviau at debian.org>  Thu, 30 Jun 2016 14:44:15 +0200
+
 ring (20160422.1.3c07c8e~dfsg1-4) unstable; urgency=medium
 
   * Fix maintscript-calls-ldconfig lintian warning.
diff --git a/debian/copyright b/debian/copyright
index b3b766a..73f340f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -32,6 +32,7 @@ Files-Excluded: client-windows/*
                 daemon/contrib/tarballs/x264*
                 daemon/contrib/tarballs/libgsm*
                 daemon/contrib/tarballs/jsoncpp*
+                daemon/contrib/tarballs/iax*
 
 
 Files: *
@@ -61,9 +62,6 @@ Comment: Upstream embeds everything that is needed to build ring inside the rele
   - http://lists.pjsip.org/pipermail/pjsip_lists.pjsip.org/2014-October/017905.html
   - http://lists.pjsip.org/pipermail/pjsip_lists.pjsip.org/2015-January/018072.html
   - http://lists.pjsip.org/pipermail/pjsip_lists.pjsip.org/2016-April/019196.html
- .
- libiax2 was kept because it is a version of the library hosted and maintained by Savoir-Faire Linux
- for the Ring project.
 
 #####################
 ## Start of daemon ##
@@ -142,56 +140,6 @@ License: LGPL-2.1+
 ################
 
 ######################
-## Start of libaix2 ##
-######################
-
-Files: daemon/contrib/tarballs-unpacked/iax-git.tar.gz/*
-Copyright: 1999 Mark Spencer
-           1999 Linux Support Services
-License: GPL-2
-
-Files: daemon/contrib/tarballs-unpacked/iax-git.tar.gz/libiax2.git/src/frame.h
-       daemon/contrib/tarballs-unpacked/iax-git.tar.gz/libiax2.git/src/iax-client.h
-       daemon/contrib/tarballs-unpacked/iax-git.tar.gz/libiax2.git/src/iax.c
-       daemon/contrib/tarballs-unpacked/iax-git.tar.gz/libiax2.git/src/iax.h
-       daemon/contrib/tarballs-unpacked/iax-git.tar.gz/libiax2.git/src/iax2-parser.c
-       daemon/contrib/tarballs-unpacked/iax-git.tar.gz/libiax2.git/src/iax2-parser.h
-       daemon/contrib/tarballs-unpacked/iax-git.tar.gz/libiax2.git/src/iax2.h
-       daemon/contrib/tarballs-unpacked/iax-git.tar.gz/libiax2.git/src/jitterbuf.c
-       daemon/contrib/tarballs-unpacked/iax-git.tar.gz/libiax2.git/src/jitterbuf.h
-Copyright: 1999 Mark Spencer
-           2001 Linux Support Services
-           2003-2004 Digium
-           2004-2005 Horizon Wimba Inc
-License: LGPL-2.0
-
-Files: daemon/contrib/tarballs-unpacked/iax-git.tar.gz/libiax2.git/src/md5.c
-Copyright: 1993 Colin Plumb
-License: public-domain
- This code implements the MD5 message-digest algorithm.
- The algorithm is due to Ron Rivest.  This code was
- written by Colin Plumb in 1993, no copyright is claimed.
- This code is in the public domain; do with it what you wish.
-
-Files: daemon/contrib/tarballs-unpacked/iax-git.tar.gz/libiax2.git/depcomp
-       daemon/contrib/tarballs-unpacked/iax-git.tar.gz/libiax2.git/missing
-Copyright: 1999-2005 Free Software Foundation, Inc.
-License: GPL-2+
-
-Files: daemon/contrib/tarballs-unpacked/iax-git.tar.gz/libiax2.git/install-sh
-Copyright: 1994 X Consortium
-License: Expat
-
-Files: daemon/contrib/tarballs-unpacked/iax-git.tar.gz/libiax2.git/mkinstalldirs
-Copyright: Noah Friedman <friedman at prep.ai.mit.edu>
-License: public-domain
- No license nor text accompanied the mention 'Public Domain'.
-
-####################
-## End of libaix2 ##
-####################
-
-######################
 ## Start of msgpack ##
 ######################
 
diff --git a/debian/rules b/debian/rules
index 0064f74..8550e64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,6 @@ override_dh_auto_configure:
 
 	# Prevent bootstrap script from verifying checksums
 	mkdir -p daemon/contrib/native
-	touch daemon/contrib/native/.sum-iax
 	touch daemon/contrib/native/.sum-msgpack
 	touch daemon/contrib/native/.sum-opendht
 	touch daemon/contrib/native/.sum-pjproject
@@ -42,6 +41,7 @@ override_dh_auto_configure:
 	cd daemon/contrib/native && \
         ../bootstrap \
 				--disable-ogg \
+				--without-iax \
 				--disable-flac \
 				--disable-vorbis \
 				--disable-vorbisenc \

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