diff --git a/Makefile.packaging b/Makefile.packaging index 468a760425b6c241b26b7018aac3a13cdb76e622..8ad676051a94a0670ede4f38679d24317f898d47 100644 --- a/Makefile.packaging +++ b/Makefile.packaging @@ -72,30 +72,14 @@ $(RELEASE_TARBALL_FILENAME): ####################### .PHONY: package-all -package-all: package-debian_8 \ - package-debian_8_i386 \ - package-debian_9 \ +package-all: package-debian_9 \ package-debian_9_i386 \ - package-ubuntu_14.04 \ - package-ubuntu_14.04_i386 \ - package-ubuntu_15.10 \ - package-ubuntu_15.10_i386 \ package-ubuntu_16.04 \ package-ubuntu_16.04_i386 \ - package-ubuntu_16.10 \ - package-ubuntu_16.10_i386 \ - package-ubuntu_17.04 \ - package-ubuntu_17.04_i386 \ package-ubuntu_17.10 \ package-ubuntu_17.10_i386 \ - package-fedora_22 \ - package-fedora_22_i386 \ - package-fedora_23 \ - package-fedora_23_i386 \ - package-fedora_24 \ - package-fedora_24_i386 \ - package-fedora_25 \ - package-fedora_25_i386 \ + package-ubuntu_18.04 \ + package-ubuntu_18.04_i386 \ package-fedora_26 \ package-fedora_26_i386 \ package-fedora_27 \ diff --git a/client-android b/client-android index ca337974e3383a798333a23a303ead9120c33f14..59c28d04ca079bf7bb7b9b39b273248901301f2f 160000 --- a/client-android +++ b/client-android @@ -1 +1 @@ -Subproject commit ca337974e3383a798333a23a303ead9120c33f14 +Subproject commit 59c28d04ca079bf7bb7b9b39b273248901301f2f diff --git a/client-gnome b/client-gnome index 02b283d7ddac093d7a729d5602815587135a23e8..a3ae9fd07f296b282abdbaf5338750af583675a8 160000 --- a/client-gnome +++ b/client-gnome @@ -1 +1 @@ -Subproject commit 02b283d7ddac093d7a729d5602815587135a23e8 +Subproject commit a3ae9fd07f296b282abdbaf5338750af583675a8 diff --git a/daemon b/daemon index a386003fe234b17bb5f309635252a8baa3cb5e4e..36c6d857289199c6ace3d6e1f6995e25cdcb4b8d 160000 --- a/daemon +++ b/daemon @@ -1 +1 @@ -Subproject commit a386003fe234b17bb5f309635252a8baa3cb5e4e +Subproject commit 36c6d857289199c6ace3d6e1f6995e25cdcb4b8d diff --git a/docker/Dockerfile_ubuntu_15.10 b/docker/Dockerfile_ubuntu_18.04 similarity index 90% rename from docker/Dockerfile_ubuntu_15.10 rename to docker/Dockerfile_ubuntu_18.04 index 1358ca4d45e09764db1ef711ba8ada10aace33db..5bdbacb0ce7344716ea92f6557ba8ad0255924dc 100644 --- a/docker/Dockerfile_ubuntu_15.10 +++ b/docker/Dockerfile_ubuntu_18.04 @@ -1,10 +1,10 @@ -FROM ubuntu:15.10 +FROM ubuntu:18.04 ENV DEBIAN_FRONTEND noninteractive RUN apt-get clean RUN apt-get update && \ - apt-get install -y vim devscripts equivs + apt-get install -y devscripts equivs # Speed up mk-build-deps RUN apt-get clean @@ -20,6 +20,7 @@ RUN apt-get update && \ libdbus-c++-dev \ libupnp-dev \ libgnutls28-dev \ + libargon2-0-dev \ libebook1.2-dev \ libcanberra-gtk3-dev \ libclutter-gtk-1.0-dev \ @@ -55,15 +56,16 @@ RUN apt-get update && \ libudev-dev \ libgsm1-dev \ libjsoncpp-dev \ + libmsgpack-dev \ libnatpmp-dev \ - libappindicator3-dev \ + libayatana-appindicator3-dev \ libqrencode-dev \ libnm-dev \ libwebkit2gtk-4.0-dev \ libcrypto++-dev \ libva-dev \ libvdpau-dev \ - libssl-dev + libssl-dev ADD scripts/build-package-debian.sh /opt/build-package-debian.sh diff --git a/docker/Dockerfile_ubuntu_15.10_i386 b/docker/Dockerfile_ubuntu_18.04_i386 similarity index 90% rename from docker/Dockerfile_ubuntu_15.10_i386 rename to docker/Dockerfile_ubuntu_18.04_i386 index c80de94ee1477cedf5ffeeafd75a725916256e95..be936244e647de2fc2554a4fad7f2f29e33f090f 100644 --- a/docker/Dockerfile_ubuntu_15.10_i386 +++ b/docker/Dockerfile_ubuntu_18.04_i386 @@ -1,10 +1,10 @@ -FROM i386/ubuntu:15.10 +FROM i386/ubuntu:18.04 ENV DEBIAN_FRONTEND noninteractive RUN apt-get clean RUN apt-get update && \ - apt-get install -y vim devscripts equivs + apt-get install -y devscripts equivs # Speed up mk-build-deps RUN apt-get clean @@ -20,6 +20,7 @@ RUN apt-get update && \ libdbus-c++-dev \ libupnp-dev \ libgnutls28-dev \ + libargon2-0-dev \ libebook1.2-dev \ libcanberra-gtk3-dev \ libclutter-gtk-1.0-dev \ @@ -55,15 +56,16 @@ RUN apt-get update && \ libudev-dev \ libgsm1-dev \ libjsoncpp-dev \ + libmsgpack-dev \ libnatpmp-dev \ - libappindicator3-dev \ + libayatana-appindicator3-dev \ libqrencode-dev \ libnm-dev \ libwebkit2gtk-4.0-dev \ libcrypto++-dev \ libva-dev \ libvdpau-dev \ - libssl-dev + libssl-dev ADD scripts/build-package-debian.sh /opt/build-package-debian.sh diff --git a/lrc b/lrc index c69ae83d46411497cb3e20281934318c546af3ab..82f8718fd21a7d310ac170f69a7683db74ca9f64 160000 --- a/lrc +++ b/lrc @@ -1 +1 @@ -Subproject commit c69ae83d46411497cb3e20281934318c546af3ab +Subproject commit 82f8718fd21a7d310ac170f69a7683db74ca9f64 diff --git a/make-ring.py b/make-ring.py index 110bfd043a5ec1702edf9b795bd06bf316cc8855..01c108ebee217828954c8a1360b3ddcdd8805af7 100755 --- a/make-ring.py +++ b/make-ring.py @@ -117,7 +117,7 @@ DNF_DEPENDENCIES = [ APT_DEPENDENCIES = [ 'autoconf', 'autoconf-archive', 'autopoint', 'cmake', 'dbus', 'doxygen', 'g++', 'gettext', 'gnome-icon-theme-symbolic', 'libasound2-dev', 'libavcodec-dev', - 'libavcodec-extra', 'libavdevice-dev', 'libavformat-dev', 'libboost-dev', + 'libavdevice-dev', 'libavformat-dev', 'libboost-dev', 'libclutter-gtk-1.0-dev', 'libcppunit-dev', 'libdbus-1-dev', 'libdbus-c++-dev', 'libebook1.2-dev', 'libexpat1-dev', 'libgnutls28-dev', 'libgsm1-dev', 'libgtk-3-dev', 'libjack-dev', 'libnotify-dev', diff --git a/scripts/make-packaging-target.py b/scripts/make-packaging-target.py index 916d9b457421aefa0f8004ffb26e123f5b56c799..58c7ccde60a6c1189d6cd1227cda499510ed2b87 100755 --- a/scripts/make-packaging-target.py +++ b/scripts/make-packaging-target.py @@ -92,16 +92,6 @@ def run_generate(parsed_args): def run_generate_all(parsed_args): targets = [ # Debian - { - "distribution": "debian_8", - "debian_packaging_override": "", - "output_file": "$(DEBIAN_DSC_FILENAME)", - }, - { - "distribution": "debian_8_i386", - "debian_packaging_override": "", - "output_file": "$(DEBIAN_DSC_FILENAME)", - }, { "distribution": "debian_9", "debian_packaging_override": "", @@ -113,26 +103,6 @@ def run_generate_all(parsed_args): "output_file": "$(DEBIAN_DSC_FILENAME)", }, # Ubuntu - { - "distribution": "ubuntu_14.04", - "debian_packaging_override": "", - "output_file": "$(DEBIAN_DSC_FILENAME)", - }, - { - "distribution": "ubuntu_14.04_i386", - "debian_packaging_override": "", - "output_file": "$(DEBIAN_DSC_FILENAME)", - }, - { - "distribution": "ubuntu_15.10", - "debian_packaging_override": "", - "output_file": "$(DEBIAN_DSC_FILENAME)", - }, - { - "distribution": "ubuntu_15.10_i386", - "debian_packaging_override": "", - "output_file": "$(DEBIAN_DSC_FILENAME)", - }, { "distribution": "ubuntu_16.04", "debian_packaging_override": "", @@ -144,76 +114,26 @@ def run_generate_all(parsed_args): "output_file": "$(DEBIAN_DSC_FILENAME)", }, { - "distribution": "ubuntu_16.10", - "debian_packaging_override": "", - "output_file": "$(DEBIAN_DSC_FILENAME)", - }, - { - "distribution": "ubuntu_16.10_i386", - "debian_packaging_override": "", - "output_file": "$(DEBIAN_DSC_FILENAME)", - }, - { - "distribution": "ubuntu_17.04", + "distribution": "ubuntu_17.10", "debian_packaging_override": "", "output_file": "$(DEBIAN_DSC_FILENAME)", }, { - "distribution": "ubuntu_17.04_i386", + "distribution": "ubuntu_17.10_i386", "debian_packaging_override": "", "output_file": "$(DEBIAN_DSC_FILENAME)", }, { - "distribution": "ubuntu_17.10", + "distribution": "ubuntu_18.04", "debian_packaging_override": "", "output_file": "$(DEBIAN_DSC_FILENAME)", }, { - "distribution": "ubuntu_17.10_i386", + "distribution": "ubuntu_18.04_i386", "debian_packaging_override": "", "output_file": "$(DEBIAN_DSC_FILENAME)", }, # Fedora - { - "distribution": "fedora_22", - "debian_packaging_override": "", - "output_file": ".packages-built", - }, - { - "distribution": "fedora_22_i386", - "debian_packaging_override": "", - "output_file": ".packages-built", - }, - { - "distribution": "fedora_23", - "debian_packaging_override": "", - "output_file": ".packages-built", - }, - { - "distribution": "fedora_23_i386", - "debian_packaging_override": "", - "output_file": ".packages-built", - }, - { - "distribution": "fedora_24", - "debian_packaging_override": "", - "output_file": ".packages-built", - }, - { - "distribution": "fedora_24_i386", - "debian_packaging_override": "", - "output_file": ".packages-built", - }, - { - "distribution": "fedora_25", - "debian_packaging_override": "", - "output_file": ".packages-built", - }, - { - "distribution": "fedora_25_i386", - "debian_packaging_override": "", - "output_file": ".packages-built", - }, { "distribution": "fedora_26", "debian_packaging_override": "",