From 9c5c4ad2a88de500963366589e82f866021d632e Mon Sep 17 00:00:00 2001
From: aviau <alexandre@alexandreviau.net>
Date: Wed, 20 Jul 2016 14:07:34 -0400
Subject: [PATCH] Debian packaging fixes
This imports some of the changes made in the official Debian packaging
repository: https://anonscm.debian.org/cgit/pkg-voip/ring.git
- Don't run containers in interactive mode, which would require a TTY
- Build LRC with Debug symbols
- Build with V=1 to allow parsing logs
- Reorganize dependencies
- Try fetch-all three times before giving up
- Removed ubuntu15.04 references
Tuleap: #858
Change-Id: If0a81b15230a31d120982e113e695443262568e3
---
Makefile.packaging | 2 +-
client-gnome | 2 +-
daemon | 2 +-
docker/Dockerfile_debian8 | 62 ++++++++++++++++++++++-------
docker/Dockerfile_debian8_i386 | 62 ++++++++++++++++++++++-------
docker/Dockerfile_debian9 | 62 ++++++++++++++++++++++-------
docker/Dockerfile_debian9_i386 | 62 ++++++++++++++++++++++-------
docker/Dockerfile_ubuntu14.04 | 63 +++++++++++++++++++++++-------
docker/Dockerfile_ubuntu14.04_i386 | 63 +++++++++++++++++++++++-------
docker/Dockerfile_ubuntu15.10 | 63 +++++++++++++++++++++++-------
docker/Dockerfile_ubuntu15.10_i386 | 63 +++++++++++++++++++++++-------
docker/Dockerfile_ubuntu16.04 | 63 +++++++++++++++++++++++-------
docker/Dockerfile_ubuntu16.04_i386 | 63 +++++++++++++++++++++++-------
lrc | 2 +-
packaging/rules/debian/control | 18 ++++-----
packaging/rules/debian/rules | 14 +++----
scripts/build-package-debian.sh | 2 +-
scripts/make-packaging-target.py | 9 -----
18 files changed, 495 insertions(+), 182 deletions(-)
diff --git a/Makefile.packaging b/Makefile.packaging
index a2578cee..a501cae0 100644
--- a/Makefile.packaging
+++ b/Makefile.packaging
@@ -54,7 +54,7 @@ $(RELEASE_TARBALL_FILENAME):
mkdir -p daemon/contrib/native
cd daemon/contrib/native && \
../bootstrap && \
- make fetch-all
+ make fetch-all || make fetch-all || make fetch-all
rm -rf daemon/contrib/native
cd $(TMPDIR) && \
diff --git a/client-gnome b/client-gnome
index 884c37c0..f762d388 160000
--- a/client-gnome
+++ b/client-gnome
@@ -1 +1 @@
-Subproject commit 884c37c0d1ceb17d0146f174d014f56092373593
+Subproject commit f762d3883db21d53980b6ba66a9ebd034cda6959
diff --git a/daemon b/daemon
index 150035a8..eb67d2fc 160000
--- a/daemon
+++ b/daemon
@@ -1 +1 @@
-Subproject commit 150035a81912cc8109331c684d8ad5be6b343e8f
+Subproject commit eb67d2fc61853eb3b29ed7b8dd70553f18ac7f01
diff --git a/docker/Dockerfile_debian8 b/docker/Dockerfile_debian8
index 1374b258..bced958d 100644
--- a/docker/Dockerfile_debian8
+++ b/docker/Dockerfile_debian8
@@ -5,21 +5,53 @@ RUN apt-get update && \
# Speed up mk-build-deps
RUN apt-get update && \
- apt-get install -y autoconf automake cmake libtool libdbus-1-dev \
- libdbus-c++-dev libupnp-dev \
- libebook1.2-dev libclutter-gtk-1.0-dev \
- libclutter-1.0-dev libglib2.0-dev libgtk-3-dev \
- libnotify-dev qtbase5-dev qttools5-dev \
- qttools5-dev-tools yasm unbound-anchor git-core \
- autotools-dev gnome-icon-theme-symbolic gettext \
- libpulse-dev libsamplerate0-dev libasound2-dev \
- libexpat1-dev libpcre3-dev libyaml-cpp-dev \
- libboost-dev libsndfile1-dev libsrtp-dev \
- libxext-dev libxfixes-dev autopoint libspeex-dev \
- libspeexdsp-dev chrpath uuid-dev libavcodec-dev \
- libavutil-dev libavformat-dev libswscale-dev \
- libavdevice-dev libopus-dev libudev-dev libticonv-dev \
- libgsm1-dev libjsoncpp-dev libqrencode-dev
+ apt-get install -y -o Acquire::Retires=10 \
+ autoconf \
+ automake \
+ autopoint \
+ cmake \
+ libtool \
+ libdbus-1-dev \
+ libdbus-c++-dev \
+ libupnp-dev \
+ libebook1.2-dev \
+ libclutter-gtk-1.0-dev \
+ libclutter-1.0-dev \
+ libglib2.0-dev \
+ libgtk-3-dev \
+ libnotify-dev \
+ qtbase5-dev \
+ qttools5-dev \
+ qttools5-dev-tools \
+ yasm \
+ autotools-dev \
+ gettext \
+ libpulse-dev \
+ libsamplerate0-dev \
+ libasound2-dev \
+ libexpat1-dev \
+ libpcre3-dev \
+ libyaml-cpp-dev \
+ libboost-dev \
+ libsndfile1-dev \
+ libsrtp-dev \
+ libxext-dev \
+ libxfixes-dev \
+ libspeex-dev \
+ libspeexdsp-dev \
+ uuid-dev \
+ libavcodec-dev \
+ libavutil-dev \
+ libavformat-dev \
+ libswscale-dev \
+ libavdevice-dev \
+ libopus-dev \
+ libudev-dev \
+ libgsm1-dev \
+ libjsoncpp-dev \
+ libnatpmp-dev \
+ libappindicator3-dev \
+ libqrencode-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_debian8_i386 b/docker/Dockerfile_debian8_i386
index 02ed1ad6..c0d2db01 100644
--- a/docker/Dockerfile_debian8_i386
+++ b/docker/Dockerfile_debian8_i386
@@ -5,21 +5,53 @@ RUN apt-get update && \
# Speed up mk-build-deps
RUN apt-get update && \
- apt-get install -y autoconf automake cmake libtool libdbus-1-dev \
- libdbus-c++-dev libupnp-dev \
- libebook1.2-dev libclutter-gtk-1.0-dev \
- libclutter-1.0-dev libglib2.0-dev libgtk-3-dev \
- libnotify-dev qtbase5-dev qttools5-dev \
- qttools5-dev-tools yasm unbound-anchor git-core \
- autotools-dev gnome-icon-theme-symbolic gettext \
- libpulse-dev libsamplerate0-dev libasound2-dev \
- libexpat1-dev libpcre3-dev libyaml-cpp-dev \
- libboost-dev libsndfile1-dev libsrtp-dev \
- libxext-dev libxfixes-dev autopoint libspeex-dev \
- libspeexdsp-dev chrpath uuid-dev libavcodec-dev \
- libavutil-dev libavformat-dev libswscale-dev \
- libavdevice-dev libopus-dev libudev-dev libticonv-dev \
- libgsm1-dev libjsoncpp-dev libqrencode-dev
+ apt-get install -y -o Acquire::Retires=10 \
+ autoconf \
+ automake \
+ autopoint \
+ cmake \
+ libtool \
+ libdbus-1-dev \
+ libdbus-c++-dev \
+ libupnp-dev \
+ libebook1.2-dev \
+ libclutter-gtk-1.0-dev \
+ libclutter-1.0-dev \
+ libglib2.0-dev \
+ libgtk-3-dev \
+ libnotify-dev \
+ qtbase5-dev \
+ qttools5-dev \
+ qttools5-dev-tools \
+ yasm \
+ autotools-dev \
+ gettext \
+ libpulse-dev \
+ libsamplerate0-dev \
+ libasound2-dev \
+ libexpat1-dev \
+ libpcre3-dev \
+ libyaml-cpp-dev \
+ libboost-dev \
+ libsndfile1-dev \
+ libsrtp-dev \
+ libxext-dev \
+ libxfixes-dev \
+ libspeex-dev \
+ libspeexdsp-dev \
+ uuid-dev \
+ libavcodec-dev \
+ libavutil-dev \
+ libavformat-dev
+ libswscale-dev \
+ libavdevice-dev \
+ libopus-dev \
+ libudev-dev \
+ libgsm1-dev \
+ libjsoncpp-dev \
+ libnatpmp-dev \
+ libappindicator3-dev \
+ libqrencode-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_debian9 b/docker/Dockerfile_debian9
index bf486e78..ef32b438 100644
--- a/docker/Dockerfile_debian9
+++ b/docker/Dockerfile_debian9
@@ -5,21 +5,53 @@ RUN apt-get update && \
# Speed up mk-build-deps
RUN apt-get update && \
- apt-get install -y autoconf automake cmake libtool libdbus-1-dev \
- libdbus-c++-dev libupnp-dev libgnutls28-dev \
- libebook1.2-dev libclutter-gtk-1.0-dev \
- libclutter-1.0-dev libglib2.0-dev libgtk-3-dev \
- libnotify-dev qtbase5-dev qttools5-dev \
- qttools5-dev-tools yasm unbound-anchor git-core \
- autotools-dev gnome-icon-theme-symbolic gettext \
- libpulse-dev libsamplerate0-dev libasound2-dev \
- libexpat1-dev libpcre3-dev libyaml-cpp-dev \
- libboost-dev libsndfile1-dev libsrtp-dev \
- libxext-dev libxfixes-dev autopoint libspeex-dev \
- libspeexdsp-dev chrpath uuid-dev libavcodec-dev \
- libavutil-dev libavformat-dev libswscale-dev \
- libavdevice-dev libopus-dev libudev-dev libticonv-dev \
- libgsm1-dev libjsoncpp-dev libqrencode-dev
+ apt-get install -y -o Acquire::Retires=10 \
+ autoconf \
+ automake \
+ autopoint \
+ cmake \
+ libtool \
+ libdbus-1-dev \
+ libdbus-c++-dev \
+ libupnp-dev \
+ libebook1.2-dev \
+ libclutter-gtk-1.0-dev \
+ libclutter-1.0-dev \
+ libglib2.0-dev \
+ libgtk-3-dev \
+ libnotify-dev \
+ qtbase5-dev \
+ qttools5-dev \
+ qttools5-dev-tools \
+ yasm \
+ autotools-dev \
+ gettext \
+ libpulse-dev \
+ libsamplerate0-dev \
+ libasound2-dev \
+ libexpat1-dev \
+ libpcre3-dev \
+ libyaml-cpp-dev \
+ libboost-dev \
+ libsndfile1-dev \
+ libsrtp-dev \
+ libxext-dev \
+ libxfixes-dev \
+ libspeex-dev \
+ libspeexdsp-dev \
+ uuid-dev \
+ libavcodec-dev \
+ libavutil-dev \
+ libavformat-dev \
+ libswscale-dev \
+ libavdevice-dev \
+ libopus-dev \
+ libudev-dev \
+ libgsm1-dev \
+ libjsoncpp-dev \
+ libnatpmp-dev \
+ libappindicator3-dev \
+ libqrencode-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_debian9_i386 b/docker/Dockerfile_debian9_i386
index b104c1e4..ed3bbdae 100644
--- a/docker/Dockerfile_debian9_i386
+++ b/docker/Dockerfile_debian9_i386
@@ -5,21 +5,53 @@ RUN apt-get update && \
# Speed up mk-build-deps
RUN apt-get update && \
- apt-get install -y autoconf automake cmake libtool libdbus-1-dev \
- libdbus-c++-dev libupnp-dev libgnutls28-dev \
- libebook1.2-dev libclutter-gtk-1.0-dev \
- libclutter-1.0-dev libglib2.0-dev libgtk-3-dev \
- libnotify-dev qtbase5-dev qttools5-dev \
- qttools5-dev-tools yasm unbound-anchor git-core \
- autotools-dev gnome-icon-theme-symbolic gettext \
- libpulse-dev libsamplerate0-dev libasound2-dev \
- libexpat1-dev libpcre3-dev libyaml-cpp-dev \
- libboost-dev libsndfile1-dev libsrtp-dev \
- libxext-dev libxfixes-dev autopoint libspeex-dev \
- libspeexdsp-dev chrpath uuid-dev libavcodec-dev \
- libavutil-dev libavformat-dev libswscale-dev \
- libavdevice-dev libopus-dev libudev-dev libticonv-dev \
- libgsm1-dev libjsoncpp-dev libqrencode-dev
+ apt-get install -y -o Acquire::Retires=10 \
+ autoconf \
+ automake \
+ autopoint \
+ cmake \
+ libtool \
+ libdbus-1-dev \
+ libdbus-c++-dev \
+ libupnp-dev \
+ libebook1.2-dev \
+ libclutter-gtk-1.0-dev \
+ libclutter-1.0-dev \
+ libglib2.0-dev \
+ libgtk-3-dev \
+ libnotify-dev \
+ qtbase5-dev \
+ qttools5-dev \
+ qttools5-dev-tools \
+ yasm \
+ autotools-dev \
+ gettext \
+ libpulse-dev \
+ libsamplerate0-dev \
+ libasound2-dev \
+ libexpat1-dev \
+ libpcre3-dev \
+ libyaml-cpp-dev \
+ libboost-dev \
+ libsndfile1-dev \
+ libsrtp-dev \
+ libxext-dev \
+ libxfixes-dev \
+ libspeex-dev \
+ libspeexdsp-dev \
+ uuid-dev \
+ libavcodec-dev \
+ libavutil-dev \
+ libavformat-dev \
+ libswscale-dev \
+ libavdevice-dev \
+ libopus-dev \
+ libudev-dev \
+ libgsm1-dev \
+ libjsoncpp-dev \
+ libnatpmp-dev \
+ libappindicator3-dev \
+ libqrencode-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu14.04 b/docker/Dockerfile_ubuntu14.04
index 1f0362d9..032d07db 100644
--- a/docker/Dockerfile_ubuntu14.04
+++ b/docker/Dockerfile_ubuntu14.04
@@ -5,21 +5,54 @@ RUN apt-get update && \
# Speed up mk-build-deps
RUN apt-get update && \
- apt-get install -y autoconf automake cmake libtool libdbus-1-dev \
- libdbus-c++-dev libupnp-dev \
- libebook1.2-dev libclutter-gtk-1.0-dev \
- libclutter-1.0-dev libglib2.0-dev libgtk-3-dev \
- libnotify-dev qtbase5-dev qttools5-dev \
- qttools5-dev-tools yasm unbound-anchor git-core \
- autotools-dev gnome-icon-theme-symbolic gettext \
- libpulse-dev libsamplerate0-dev libasound2-dev \
- libexpat1-dev libpcre3-dev libyaml-cpp-dev \
- libboost-dev libsndfile1-dev libsrtp-dev \
- libxext-dev libxfixes-dev autopoint libspeex-dev \
- libspeexdsp-dev chrpath uuid-dev libavcodec-dev \
- libavutil-dev libavformat-dev libswscale-dev \
- libavdevice-dev libopus-dev libudev-dev libticonv-dev \
- libgsm1-dev libjsoncpp-dev libqrencode-dev
+ apt-get install -y -o Acquire::Retires=10 \
+ autoconf \
+ automake \
+ autopoint \
+ cmake \
+ libtool \
+ libdbus-1-dev \
+ libdbus-c++-dev \
+ libupnp-dev \
+ libgnutls28-dev \
+ libebook1.2-dev \
+ libclutter-gtk-1.0-dev \
+ libclutter-1.0-dev \
+ libglib2.0-dev \
+ libgtk-3-dev \
+ libnotify-dev \
+ qtbase5-dev \
+ qttools5-dev \
+ qttools5-dev-tools \
+ yasm \
+ autotools-dev \
+ gettext \
+ libpulse-dev \
+ libsamplerate0-dev \
+ libasound2-dev \
+ libexpat1-dev \
+ libpcre3-dev \
+ libyaml-cpp-dev \
+ libboost-dev \
+ libsndfile1-dev \
+ libsrtp-dev \
+ libxext-dev \
+ libxfixes-dev \
+ libspeex-dev \
+ libspeexdsp-dev \
+ uuid-dev \
+ libavcodec-dev \
+ libavutil-dev \
+ libavformat-dev \
+ libswscale-dev \
+ libavdevice-dev \
+ libopus-dev \
+ libudev-dev \
+ libgsm1-dev \
+ libjsoncpp-dev \
+ libnatpmp-dev \
+ libappindicator3-dev \
+ libqrencode-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu14.04_i386 b/docker/Dockerfile_ubuntu14.04_i386
index c00d9287..215ea7cc 100644
--- a/docker/Dockerfile_ubuntu14.04_i386
+++ b/docker/Dockerfile_ubuntu14.04_i386
@@ -5,21 +5,54 @@ RUN apt-get update && \
# Speed up mk-build-deps
RUN apt-get update && \
- apt-get install -y autoconf automake cmake libtool libdbus-1-dev \
- libdbus-c++-dev libupnp-dev \
- libebook1.2-dev libclutter-gtk-1.0-dev \
- libclutter-1.0-dev libglib2.0-dev libgtk-3-dev \
- libnotify-dev qtbase5-dev qttools5-dev \
- qttools5-dev-tools yasm unbound-anchor git-core \
- autotools-dev gnome-icon-theme-symbolic gettext \
- libpulse-dev libsamplerate0-dev libasound2-dev \
- libexpat1-dev libpcre3-dev libyaml-cpp-dev \
- libboost-dev libsndfile1-dev libsrtp-dev \
- libxext-dev libxfixes-dev autopoint libspeex-dev \
- libspeexdsp-dev chrpath uuid-dev libavcodec-dev \
- libavutil-dev libavformat-dev libswscale-dev \
- libavdevice-dev libopus-dev libudev-dev libticonv-dev \
- libgsm1-dev libjsoncpp-dev libqrencode-dev
+ apt-get install -y -o Acquire::Retires=10 \
+ autoconf \
+ automake \
+ autopoint \
+ cmake \
+ libtool \
+ libdbus-1-dev \
+ libdbus-c++-dev \
+ libupnp-dev \
+ libgnutls28-dev \
+ libebook1.2-dev \
+ libclutter-gtk-1.0-dev \
+ libclutter-1.0-dev \
+ libglib2.0-dev \
+ libgtk-3-dev \
+ libnotify-dev \
+ qtbase5-dev \
+ qttools5-dev \
+ qttools5-dev-tools \
+ yasm \
+ autotools-dev \
+ gettext \
+ libpulse-dev \
+ libsamplerate0-dev \
+ libasound2-dev \
+ libexpat1-dev \
+ libpcre3-dev \
+ libyaml-cpp-dev \
+ libboost-dev \
+ libsndfile1-dev \
+ libsrtp-dev \
+ libxext-dev \
+ libxfixes-dev \
+ libspeex-dev \
+ libspeexdsp-dev \
+ uuid-dev \
+ libavcodec-dev \
+ libavutil-dev \
+ libavformat-dev \
+ libswscale-dev \
+ libavdevice-dev \
+ libopus-dev \
+ libudev-dev \
+ libgsm1-dev \
+ libjsoncpp-dev \
+ libnatpmp-dev \
+ libappindicator3-dev \
+ libqrencode-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu15.10 b/docker/Dockerfile_ubuntu15.10
index d44df7e4..34132a5d 100644
--- a/docker/Dockerfile_ubuntu15.10
+++ b/docker/Dockerfile_ubuntu15.10
@@ -5,21 +5,54 @@ RUN apt-get update && \
# Speed up mk-build-deps
RUN apt-get update && \
- apt-get install -y autoconf automake cmake libtool libdbus-1-dev \
- libdbus-c++-dev libupnp-dev \
- libebook1.2-dev libclutter-gtk-1.0-dev \
- libclutter-1.0-dev libglib2.0-dev libgtk-3-dev \
- libnotify-dev qtbase5-dev qttools5-dev \
- qttools5-dev-tools yasm unbound-anchor git-core \
- autotools-dev gnome-icon-theme-symbolic gettext \
- libpulse-dev libsamplerate0-dev libasound2-dev \
- libexpat1-dev libpcre3-dev libyaml-cpp-dev \
- libboost-dev libsndfile1-dev libsrtp-dev \
- libxext-dev libxfixes-dev autopoint libspeex-dev \
- libspeexdsp-dev chrpath uuid-dev libavcodec-dev \
- libavutil-dev libavformat-dev libswscale-dev \
- libavdevice-dev libopus-dev libudev-dev libticonv-dev \
- libgsm1-dev libjsoncpp-dev libqrencode-dev
+ apt-get install -y -o Acquire::Retires=10 \
+ autoconf \
+ automake \
+ autopoint \
+ cmake \
+ libtool \
+ libdbus-1-dev \
+ libdbus-c++-dev \
+ libupnp-dev \
+ libgnutls28-dev \
+ libebook1.2-dev \
+ libclutter-gtk-1.0-dev \
+ libclutter-1.0-dev \
+ libglib2.0-dev \
+ libgtk-3-dev \
+ libnotify-dev \
+ qtbase5-dev \
+ qttools5-dev \
+ qttools5-dev-tools \
+ yasm \
+ autotools-dev \
+ gettext \
+ libpulse-dev \
+ libsamplerate0-dev \
+ libasound2-dev \
+ libexpat1-dev \
+ libpcre3-dev \
+ libyaml-cpp-dev \
+ libboost-dev \
+ libsndfile1-dev \
+ libsrtp-dev \
+ libxext-dev \
+ libxfixes-dev \
+ libspeex-dev \
+ libspeexdsp-dev \
+ uuid-dev \
+ libavcodec-dev \
+ libavutil-dev \
+ libavformat-dev \
+ libswscale-dev \
+ libavdevice-dev \
+ libopus-dev \
+ libudev-dev \
+ libgsm1-dev \
+ libjsoncpp-dev \
+ libnatpmp-dev \
+ libappindicator3-dev \
+ libqrencode-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu15.10_i386 b/docker/Dockerfile_ubuntu15.10_i386
index 1913b762..be1187ea 100644
--- a/docker/Dockerfile_ubuntu15.10_i386
+++ b/docker/Dockerfile_ubuntu15.10_i386
@@ -5,21 +5,54 @@ RUN apt-get update && \
# Speed up mk-build-deps
RUN apt-get update && \
- apt-get install -y autoconf automake cmake libtool libdbus-1-dev \
- libdbus-c++-dev libupnp-dev \
- libebook1.2-dev libclutter-gtk-1.0-dev \
- libclutter-1.0-dev libglib2.0-dev libgtk-3-dev \
- libnotify-dev qtbase5-dev qttools5-dev \
- qttools5-dev-tools yasm unbound-anchor git-core \
- autotools-dev gnome-icon-theme-symbolic gettext \
- libpulse-dev libsamplerate0-dev libasound2-dev \
- libexpat1-dev libpcre3-dev libyaml-cpp-dev \
- libboost-dev libsndfile1-dev libsrtp-dev \
- libxext-dev libxfixes-dev autopoint libspeex-dev \
- libspeexdsp-dev chrpath uuid-dev libavcodec-dev \
- libavutil-dev libavformat-dev libswscale-dev \
- libavdevice-dev libopus-dev libudev-dev libticonv-dev \
- libgsm1-dev libjsoncpp-dev libqrencode-dev
+ apt-get install -y -o Acquire::Retires=10 \
+ autoconf \
+ automake \
+ autopoint \
+ cmake \
+ libtool \
+ libdbus-1-dev \
+ libdbus-c++-dev \
+ libupnp-dev \
+ libgnutls28-dev \
+ libebook1.2-dev \
+ libclutter-gtk-1.0-dev \
+ libclutter-1.0-dev \
+ libglib2.0-dev \
+ libgtk-3-dev \
+ libnotify-dev \
+ qtbase5-dev \
+ qttools5-dev \
+ qttools5-dev-tools \
+ yasm \
+ autotools-dev \
+ gettext \
+ libpulse-dev \
+ libsamplerate0-dev \
+ libasound2-dev \
+ libexpat1-dev \
+ libpcre3-dev \
+ libyaml-cpp-dev \
+ libboost-dev \
+ libsndfile1-dev \
+ libsrtp-dev \
+ libxext-dev \
+ libxfixes-dev \
+ libspeex-dev \
+ libspeexdsp-dev \
+ uuid-dev \
+ libavcodec-dev \
+ libavutil-dev \
+ libavformat-dev \
+ libswscale-dev \
+ libavdevice-dev \
+ libopus-dev \
+ libudev-dev \
+ libgsm1-dev \
+ libjsoncpp-dev \
+ libnatpmp-dev \
+ libappindicator3-dev \
+ libqrencode-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu16.04 b/docker/Dockerfile_ubuntu16.04
index 5e182f59..e3b46dcf 100644
--- a/docker/Dockerfile_ubuntu16.04
+++ b/docker/Dockerfile_ubuntu16.04
@@ -5,21 +5,54 @@ RUN apt-get update && \
# Speed up mk-build-deps
RUN apt-get update && \
- apt-get install -y autoconf automake cmake libtool libdbus-1-dev \
- libdbus-c++-dev libupnp-dev libgnutls28-dev \
- libebook1.2-dev libclutter-gtk-1.0-dev \
- libclutter-1.0-dev libglib2.0-dev libgtk-3-dev \
- libnotify-dev qtbase5-dev qttools5-dev \
- qttools5-dev-tools yasm unbound-anchor git-core \
- autotools-dev gnome-icon-theme-symbolic gettext \
- libpulse-dev libsamplerate0-dev libasound2-dev \
- libexpat1-dev libpcre3-dev libyaml-cpp-dev \
- libboost-dev libsndfile1-dev libsrtp-dev \
- libxext-dev libxfixes-dev autopoint libspeex-dev \
- libspeexdsp-dev chrpath uuid-dev libavcodec-dev \
- libavutil-dev libavformat-dev libswscale-dev \
- libavdevice-dev libopus-dev libudev-dev libticonv-dev \
- libgsm1-dev libjsoncpp-dev libqrencode-dev
+ apt-get install -y -o Acquire::Retires=10 \
+ autoconf \
+ automake \
+ autopoint \
+ cmake \
+ libtool \
+ libdbus-1-dev \
+ libdbus-c++-dev \
+ libupnp-dev \
+ libgnutls28-dev \
+ libebook1.2-dev \
+ libclutter-gtk-1.0-dev \
+ libclutter-1.0-dev \
+ libglib2.0-dev \
+ libgtk-3-dev \
+ libnotify-dev \
+ qtbase5-dev \
+ qttools5-dev \
+ qttools5-dev-tools \
+ yasm \
+ autotools-dev \
+ gettext \
+ libpulse-dev \
+ libsamplerate0-dev \
+ libasound2-dev \
+ libexpat1-dev \
+ libpcre3-dev \
+ libyaml-cpp-dev \
+ libboost-dev \
+ libsndfile1-dev \
+ libsrtp-dev \
+ libxext-dev \
+ libxfixes-dev \
+ libspeex-dev \
+ libspeexdsp-dev \
+ uuid-dev \
+ libavcodec-dev \
+ libavutil-dev \
+ libavformat-dev \
+ libswscale-dev \
+ libavdevice-dev \
+ libopus-dev \
+ libudev-dev \
+ libgsm1-dev \
+ libjsoncpp-dev \
+ libnatpmp-dev \
+ libappindicator3-dev \
+ libqrencode-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu16.04_i386 b/docker/Dockerfile_ubuntu16.04_i386
index 4f951f2a..523ac65d 100644
--- a/docker/Dockerfile_ubuntu16.04_i386
+++ b/docker/Dockerfile_ubuntu16.04_i386
@@ -5,21 +5,54 @@ RUN apt-get update && \
# Speed up mk-build-deps
RUN apt-get update && \
- apt-get install -y autoconf automake cmake libtool libdbus-1-dev \
- libdbus-c++-dev libupnp-dev libgnutls28-dev \
- libebook1.2-dev libclutter-gtk-1.0-dev \
- libclutter-1.0-dev libglib2.0-dev libgtk-3-dev \
- libnotify-dev qtbase5-dev qttools5-dev \
- qttools5-dev-tools yasm unbound-anchor git-core \
- autotools-dev gnome-icon-theme-symbolic gettext \
- libpulse-dev libsamplerate0-dev libasound2-dev \
- libexpat1-dev libpcre3-dev libyaml-cpp-dev \
- libboost-dev libsndfile1-dev libsrtp-dev \
- libxext-dev libxfixes-dev autopoint libspeex-dev \
- libspeexdsp-dev chrpath uuid-dev libavcodec-dev \
- libavutil-dev libavformat-dev libswscale-dev \
- libavdevice-dev libopus-dev libudev-dev libticonv-dev \
- libgsm1-dev libjsoncpp-dev libqrencode-dev
+ apt-get install -y -o Acquire::Retires=10 \
+ autoconf \
+ automake \
+ autopoint \
+ cmake \
+ libtool \
+ libdbus-1-dev \
+ libdbus-c++-dev \
+ libupnp-dev \
+ libgnutls28-dev \
+ libebook1.2-dev \
+ libclutter-gtk-1.0-dev \
+ libclutter-1.0-dev \
+ libglib2.0-dev \
+ libgtk-3-dev \
+ libnotify-dev \
+ qtbase5-dev \
+ qttools5-dev \
+ qttools5-dev-tools \
+ yasm \
+ autotools-dev \
+ gettext \
+ libpulse-dev \
+ libsamplerate0-dev \
+ libasound2-dev \
+ libexpat1-dev \
+ libpcre3-dev \
+ libyaml-cpp-dev \
+ libboost-dev \
+ libsndfile1-dev \
+ libsrtp-dev \
+ libxext-dev \
+ libxfixes-dev \
+ libspeex-dev \
+ libspeexdsp-dev \
+ uuid-dev \
+ libavcodec-dev \
+ libavutil-dev \
+ libavformat-dev \
+ libswscale-dev \
+ libavdevice-dev \
+ libopus-dev \
+ libudev-dev \
+ libgsm1-dev \
+ libjsoncpp-dev \
+ libnatpmp-dev \
+ libappindicator3-dev \
+ libqrencode-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/lrc b/lrc
index 3fc24faf..265adc76 160000
--- a/lrc
+++ b/lrc
@@ -1 +1 @@
-Subproject commit 3fc24faf38351b018ebe018a9785d59b76645fd9
+Subproject commit 265adc76224a50c147839ba339d48ae6ca414e3f
diff --git a/packaging/rules/debian/control b/packaging/rules/debian/control
index fd3741b6..08e779b1 100644
--- a/packaging/rules/debian/control
+++ b/packaging/rules/debian/control
@@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 9),
automake,
cmake,
libtool,
+ autotools-dev,
# gnome client
libebook1.2-dev,
libclutter-gtk-1.0-dev,
@@ -17,19 +18,14 @@ Build-Depends: debhelper (>= 9),
qtbase5-dev,
qttools5-dev,
qttools5-dev-tools,
- unbound-anchor,
- git-core,
- gnome-icon-theme-symbolic,
gettext,
libqrencode-dev,
- libappindicator-dev,
+ libappindicator3-dev,
# ring-daemon
libdbus-1-dev,
libdbus-c++-dev,
libupnp-dev,
libgnutls28-dev,
- yasm,
- autotools-dev,
libpulse-dev,
libasound2-dev,
libexpat1-dev,
@@ -37,13 +33,10 @@ Build-Depends: debhelper (>= 9),
libyaml-cpp-dev,
libboost-dev,
libsndfile1-dev,
- libsrtp-dev,
libxext-dev,
libxfixes-dev,
- autopoint,
libspeex-dev,
libspeexdsp-dev,
- chrpath,
uuid-dev,
libavcodec-dev,
libavutil-dev,
@@ -52,10 +45,13 @@ Build-Depends: debhelper (>= 9),
libavdevice-dev,
libopus-dev,
libudev-dev,
- libticonv-dev,
libgsm1-dev,
libjsoncpp-dev,
- libnatpmp-dev
+ libnatpmp-dev,
+# other
+ libsrtp-dev,
+ yasm,
+ libsamplerate0-dev
Standards-Version: 3.9.8
Homepage: https://ring.cx
Vcs-Git: https://anonscm.debian.org/git/pkg-voip/ring.git
diff --git a/packaging/rules/debian/rules b/packaging/rules/debian/rules
index 66134104..e2c81fbc 100755
--- a/packaging/rules/debian/rules
+++ b/packaging/rules/debian/rules
@@ -46,14 +46,14 @@ override_dh_auto_configure:
--disable-vorbisenc \
--disable-speex \
--disable-sndfile \
+ --disable-gsm \
--disable-speexdsp && \
make list && \
- make -j1
+ make -j1 V=1
cd daemon && \
./autogen.sh && \
./configure \
- --prefix=/usr \
- --without-iax
+ --prefix=/usr
#############################
## libringclient configure ##
@@ -64,7 +64,7 @@ override_dh_auto_configure:
cmake \
-DRING_BUILD_DIR=$(CURDIR)/daemon/src \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DENABLE_VIDEO=true \
+ -DCMAKE_BUILD_TYPE=Debug \
..
############################
@@ -84,18 +84,18 @@ override_dh_auto_build:
#######################
## Ring Daemon build ##
#######################
- cd daemon && make -j$(NO_CPUS)
+ make -C daemon -j$(NO_CPUS) V=1
pod2man daemon/man/dring.pod > daemon/dring.1
#########################
## libringclient build ##
#########################
- cd lrc/build && make -j$(NO_CPUS)
+ make -C lrc/build -j$(NO_CPUS) V=1
########################
## gnome client build ##
########################
- cd client-gnome/build && make LDFLAGS="-lpthread" -j$(NO_CPUS)
+ make -C client-gnome/build LDFLAGS="-lpthread" -j$(NO_CPUS) V=1
override_dh_auto_clean:
################################
diff --git a/scripts/build-package-debian.sh b/scripts/build-package-debian.sh
index f4c7e9cf..429f3c64 100755
--- a/scripts/build-package-debian.sh
+++ b/scripts/build-package-debian.sh
@@ -36,7 +36,7 @@ fi
# install build deps
apt-get update
-apt-get upgrade -y
+apt-get upgrade -o Acquire::Retires=10 -y
mk-build-deps --remove --install debian/control -t "apt-get -y --no-install-recommends"
# create changelog file
diff --git a/scripts/make-packaging-target.py b/scripts/make-packaging-target.py
index a50ce216..68bfe07f 100755
--- a/scripts/make-packaging-target.py
+++ b/scripts/make-packaging-target.py
@@ -37,7 +37,6 @@ PACKAGE_%(distribution)s_DOCKER_RUN_COMMAND:= docker run \\
-e CURRENT_UID=$(CURRENT_UID) \\
-v $(CURDIR):/opt/ring-project-ro:ro \\
-v $(CURDIR)/packages/%(distribution)s:/opt/output \\
- -i \\
-t ring-packaging-%(distribution)s
.docker-image-%(distribution)s: docker/Dockerfile_%(distribution)s
@@ -103,14 +102,6 @@ def run_generate_all(parsed_args):
"distribution": "ubuntu14.04_i386",
"debian_packaging_override": "",
},
- {
- "distribution": "ubuntu15.04",
- "debian_packaging_override": "",
- },
- {
- "distribution": "ubuntu15.04_i386",
- "debian_packaging_override": "",
- },
{
"distribution": "ubuntu15.10",
"debian_packaging_override": "",
--
GitLab