mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-04 05:53:43 +00:00 
			
		
		
		
	deps: Replace libz-dev with zlib1g-dev since the former was renamed.
This commit is contained in:
		
				
					committed by
					
						
						Tim Abbott
					
				
			
			
				
	
			
			
			
						parent
						
							d5736ef65a
						
					
				
				
					commit
					35969edd66
				
			@@ -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",
 | 
			
		||||
 
 | 
			
		||||
@@ -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}
 | 
			
		||||
 
 | 
			
		||||
@@ -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[@]}"
 | 
			
		||||
 
 | 
			
		||||
@@ -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'
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user