paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-16 20:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

deps: Replace libz-dev with zlib1g-dev since the former was renamed.

Browse Source
This commit is contained in:
Aditya Bansal
2018-02-10 02:58:20 +05:30
committed by Tim Abbott
parent d5736ef65a
commit 35969edd66
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/lib/setup_venv.py
View File

@@ -19,7 +19,7 @@ VENV_DEPENDENCIES = [
"build-essential", "build-essential",
"libffi-dev", "libffi-dev",
"libfreetype6-dev", # Needed for image types with Pillow "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 "libjpeg-dev", # Needed to handle JPEGs with Pillow
"libldap2-dev", "libldap2-dev",
"libmemcached-dev", "libmemcached-dev",

2
tools/circleci/Dockerfile.template
View File

@@ -91,7 +91,7 @@ RUN apt-get update \
&& apt-get install --no-install-recommends \ && apt-get install --no-install-recommends \
closure-compiler memcached rabbitmq-server redis-server \ closure-compiler memcached rabbitmq-server redis-server \
hunspell-en-us supervisor libssl-dev yui-compressor puppet \ 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 \ libldap2-dev libmemcached-dev python-dev python-pip \
python-six libxml2-dev libxslt1-dev libpq-dev \ python-six libxml2-dev libxslt1-dev libpq-dev \
{extra_packages} {extra_packages}

2
tools/test-install/prepare-base
View File

@@ -49,7 +49,7 @@ run apt-get install -y --no-install-recommends \
build-essential python3-dev \ build-essential python3-dev \
closure-compiler memcached rabbitmq-server redis-server \ closure-compiler memcached rabbitmq-server redis-server \
hunspell-en-us supervisor libssl-dev yui-compressor puppet \ 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 \ libldap2-dev libmemcached-dev python-dev python-pip \
python-six libxml2-dev libxslt1-dev libpq-dev \ python-six libxml2-dev libxslt1-dev libpq-dev \
"${extra_packages[@]}" "${extra_packages[@]}"

2
version.py
View File

@@ -8,4 +8,4 @@ ZULIP_VERSION = "1.7.1+git"
# Typically, adding a dependency only requires a minor version bump, and # Typically, adding a dependency only requires a minor version bump, and
# removing a dependency requires a major version bump. # removing a dependency requires a major version bump.
PROVISION_VERSION = '14.9' PROVISION_VERSION = '14.10'