diff -Nru nginx-1.9.15/CHANGES nginx-1.10.0/CHANGES --- nginx-1.9.15/CHANGES 2016-04-19 12:02:43.000000000 -0400 +++ nginx-1.10.0/CHANGES 2016-04-26 09:31:24.000000000 -0400 @@ -1,4 +1,9 @@ +Changes with nginx 1.10.0 26 Apr 2016 + + *) 1.10.x stable branch. + + Changes with nginx 1.9.15 19 Apr 2016 *) Bugfix: "recv() failed" errors might occur when using HHVM as a diff -Nru nginx-1.9.15/CHANGES.ru nginx-1.10.0/CHANGES.ru --- nginx-1.9.15/CHANGES.ru 2016-04-19 12:02:42.000000000 -0400 +++ nginx-1.10.0/CHANGES.ru 2016-04-26 09:31:22.000000000 -0400 @@ -1,4 +1,9 @@ +Изменения в nginx 1.10.0 26.04.2016 + + *) Стабильная ветка 1.10.x. + + Изменения в nginx 1.9.15 19.04.2016 *) Исправление: при использовании HHVM в качестве FastCGI-сервера могли diff -Nru nginx-1.9.15/debian/changelog nginx-1.10.0/debian/changelog --- nginx-1.9.15/debian/changelog 2016-04-19 12:44:35.000000000 -0400 +++ nginx-1.10.0/debian/changelog 2016-04-26 10:55:01.000000000 -0400 @@ -1,3 +1,13 @@ +nginx (1.10.0-0ubuntu1) yakkety; urgency=medium + + * New upstream release (1.10.0) - full changelog available at upstream + website - http://nginx.org/en/CHANGES-1.10 (LP: #1575217) + * All Ubuntu specific changes from 1.9.15-0ubuntu1 remain included. + * Additional changes: + * debian/patches/ubuntu-branding.patch: Refreshed Ubuntu Branding patch. + + -- Thomas Ward Tue, 26 Apr 2016 10:24:23 -0400 + nginx (1.9.15-0ubuntu1) xenial-proposed; urgency=medium * New upstream release (1.9.15) - full changelog available at upstream diff -Nru nginx-1.9.15/debian/patches/ubuntu-branding.patch nginx-1.10.0/debian/patches/ubuntu-branding.patch --- nginx-1.9.15/debian/patches/ubuntu-branding.patch 2016-04-19 12:44:10.000000000 -0400 +++ nginx-1.10.0/debian/patches/ubuntu-branding.patch 2016-04-26 10:50:26.000000000 -0400 @@ -1,7 +1,7 @@ Description: Add Ubuntu token to NGINX_VER Author: Adam Conrad Forwarded: not-needed -Last-Update: 2016-04-05 +Last-Update: 2016-04-26 Index: b/src/core/nginx.h =================================================================== @@ -9,8 +9,8 @@ +++ b/src/core/nginx.h @@ -11,7 +11,7 @@ - #define nginx_version 1009015 - #define NGINX_VERSION "1.9.15" + #define nginx_version 1010000 + #define NGINX_VERSION "1.10.0" -#define NGINX_VER "nginx/" NGINX_VERSION +#define NGINX_VER "nginx/" NGINX_VERSION " (Ubuntu)" diff -Nru nginx-1.9.15/src/core/nginx.h nginx-1.10.0/src/core/nginx.h --- nginx-1.9.15/src/core/nginx.h 2016-04-19 12:02:38.000000000 -0400 +++ nginx-1.10.0/src/core/nginx.h 2016-04-26 09:31:19.000000000 -0400 @@ -9,8 +9,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1009015 -#define NGINX_VERSION "1.9.15" +#define nginx_version 1010000 +#define NGINX_VERSION "1.10.0" #define NGINX_VER "nginx/" NGINX_VERSION #ifdef NGX_BUILD