From dc3c9ded97e55fa1a8dd5bbc3dcd98075d532898 Mon Sep 17 00:00:00 2001
From: aviau <alexandre@alexandreviau.net>
Date: Wed, 5 Oct 2016 11:13:23 -0400
Subject: [PATCH] Debian packaging: disable downloads + allow tarballs
The previously maintained list of tarballs didn't make sense because we
allowed downloads anyways. Instead, we allow all tarballs in the
orig.tar.gz and disable downloads from inside the container.
Change-Id: I949001e4e3d5f81f23b68d0aa41abd3fa801065a
---
packaging/rules/debian/copyright | 29 -----------------------------
packaging/rules/debian/rules | 1 +
2 files changed, 1 insertion(+), 29 deletions(-)
diff --git a/packaging/rules/debian/copyright b/packaging/rules/debian/copyright
index dfe36a55..ad3ae5a9 100644
--- a/packaging/rules/debian/copyright
+++ b/packaging/rules/debian/copyright
@@ -7,35 +7,6 @@ Files-Excluded: client-windows/*
client-macosx/*
client-ios/*
client-gnome/libqrencode/*
- daemon/contrib/tarballs/ffmpeg*
- daemon/contrib/tarballs/flac*
- daemon/contrib/tarballs/gmp*
- daemon/contrib/tarballs/gnutls*
- daemon/contrib/tarballs/jack*
- daemon/contrib/tarballs/libav*
- daemon/contrib/tarballs/libgcrypt*
- daemon/contrib/tarballs/libgpg*
- daemon/contrib/tarballs/libiconv*
- daemon/contrib/tarballs/libogg*
- daemon/contrib/tarballs/libsamplerate*
- daemon/contrib/tarballs/libsndfile*
- daemon/contrib/tarballs/libuuid*
- daemon/contrib/tarballs/libvorbis*
- daemon/contrib/tarballs/libvpx*
- daemon/contrib/tarballs/nettle*
- daemon/contrib/tarballs/opus*
- daemon/contrib/tarballs/pcre*
- daemon/contrib/tarballs/portaudio*
- daemon/contrib/tarballs/pupnp*
- daemon/contrib/tarballs/speex*
- daemon/contrib/tarballs/yaml-cpp*
- daemon/contrib/tarballs/zlib*
- daemon/contrib/tarballs/x264*
- daemon/contrib/tarballs/libgsm*
- daemon/contrib/tarballs/libnatpmp*
- daemon/contrib/tarballs/jsoncpp*
- daemon/contrib/tarballs/iax*
-
Files: *
Copyright: 2004-2015 Savoir-faire Linux Inc.
diff --git a/packaging/rules/debian/rules b/packaging/rules/debian/rules
index 6828637c..6eedf830 100755
--- a/packaging/rules/debian/rules
+++ b/packaging/rules/debian/rules
@@ -34,6 +34,7 @@ override_dh_auto_configure:
mkdir -p daemon/contrib/native
cd daemon/contrib/native && \
../bootstrap \
+ --disable-downloads \
--no-checksums \
--disable-ogg \
--disable-flac \
--
GitLab