From 35969edd66932a6de2ef547fe0434fbfc9ee1110 Mon Sep 17 00:00:00 2001 From: Aditya Bansal Date: Sat, 10 Feb 2018 02:58:20 +0530 Subject: [PATCH] deps: Replace libz-dev with zlib1g-dev since the former was renamed. --- scripts/lib/setup_venv.py | 2 +- tools/circleci/Dockerfile.template | 2 +- tools/test-install/prepare-base | 2 +- version.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/lib/setup_venv.py b/scripts/lib/setup_venv.py index d871c2f926..c1d0838232 100644 --- a/scripts/lib/setup_venv.py +++ b/scripts/lib/setup_venv.py @@ -19,7 +19,7 @@ VENV_DEPENDENCIES = [ "build-essential", "libffi-dev", "libfreetype6-dev", # Needed for image types with Pillow - "libz-dev", # Needed to handle compressed PNGs with Pillow + "zlib1g-dev", # Needed to handle compressed PNGs with Pillow "libjpeg-dev", # Needed to handle JPEGs with Pillow "libldap2-dev", "libmemcached-dev", diff --git a/tools/circleci/Dockerfile.template b/tools/circleci/Dockerfile.template index 9c840c40a8..1f6bd55f07 100644 --- a/tools/circleci/Dockerfile.template +++ b/tools/circleci/Dockerfile.template @@ -91,7 +91,7 @@ RUN apt-get update \ && apt-get install --no-install-recommends \ closure-compiler memcached rabbitmq-server redis-server \ hunspell-en-us supervisor libssl-dev yui-compressor puppet \ - gettext libffi-dev libfreetype6-dev libz-dev libjpeg-dev \ + gettext libffi-dev libfreetype6-dev zlib1g-dev libjpeg-dev \ libldap2-dev libmemcached-dev python-dev python-pip \ python-six libxml2-dev libxslt1-dev libpq-dev \ {extra_packages} diff --git a/tools/test-install/prepare-base b/tools/test-install/prepare-base index c00b01f23b..8930c09dca 100755 --- a/tools/test-install/prepare-base +++ b/tools/test-install/prepare-base @@ -49,7 +49,7 @@ run apt-get install -y --no-install-recommends \ build-essential python3-dev \ closure-compiler memcached rabbitmq-server redis-server \ hunspell-en-us supervisor libssl-dev yui-compressor puppet \ - gettext libffi-dev libfreetype6-dev libz-dev libjpeg-dev \ + gettext libffi-dev libfreetype6-dev zlib1g-dev libjpeg-dev \ libldap2-dev libmemcached-dev python-dev python-pip \ python-six libxml2-dev libxslt1-dev libpq-dev \ "${extra_packages[@]}" diff --git a/version.py b/version.py index 1c0b27adf7..fc65e5bee9 100644 --- a/version.py +++ b/version.py @@ -8,4 +8,4 @@ ZULIP_VERSION = "1.7.1+git" # Typically, adding a dependency only requires a minor version bump, and # removing a dependency requires a major version bump. -PROVISION_VERSION = '14.9' +PROVISION_VERSION = '14.10'