Populate stable branch.
diff --git a/debian/changelog b/debian/changelog index dd0b602..f33cc56 100644 --- a/debian/changelog +++ b/debian/changelog
@@ -1,124 +1,70 @@ -nginx (1.7.2-1) unstable; urgency=low +nginx (1.6.0-1) unstable; urgency=low - * 1.7.2 + * 1.6.0 + * http-auth-request module added - -- Sergey Budnevitch <sb@nginx.com> Tue, 17 Jun 2014 18:18:00 +0400 + -- Konstantin Pavlov <thresh@nginx.com> Thu, 24 Apr 2014 17:12:40 +0400 -nginx (1.7.1-1) unstable; urgency=low +nginx (1.4.7-1) unstable; urgency=low - * 1.7.1 - - -- Sergey Budnevitch <sb@nginx.com> Tue, 27 May 2014 18:12:00 +0400 - -nginx (1.7.0-1) unstable; urgency=low - - * 1.7.0 - - -- Konstantin Pavlov <thresh@nginx.com> Thu, 24 Apr 2014 19:30:07 +0400 - -nginx (1.5.13-1) unstable; urgency=low - - * 1.5.13 - - -- Sergey Budnevitch <sb@nginx.com> Tue, 08 Apr 2014 17:00:00 +0400 - -nginx (1.5.12-1) unstable; urgency=low - - * 1.5.12 + * 1.4.7 * warning added when binary upgrade returns non-zero exit code - -- Sergey Budnevitch <sb@nginx.com> Tue, 18 Mar 2014 16:04:01 +0400 + -- Sergey Budnevitch <sb@nginx.com> Tue, 18 Mar 2014 16:05:56 +0400 -nginx (1.5.11-1) unstable; urgency=low +nginx (1.4.6-1) unstable; urgency=low - * 1.5.11 + * 1.4.6 - -- Sergey Budnevitch <sb@nginx.com> Tue, 04 Mar 2014 15:33:32 +0400 + -- Sergey Budnevitch <sb@nginx.com> Tue, 04 Mar 2014 15:39:59 +0400 -nginx (1.5.10-1) unstable; urgency=low +nginx (1.4.5-1) unstable; urgency=low - * 1.5.10 + * 1.4.5 - -- Sergey Budnevitch <sb@nginx.com> Tue, 04 Feb 2014 16:12:01 +0400 + -- Konstantin Pavlov <thresh@nginx.com> Tue, 11 Feb 2014 17:48:22 +0400 -nginx (1.5.9-1) unstable; urgency=low +nginx (1.4.4-1) unstable; urgency=low - * 1.5.9 + * 1.4.4 - -- Sergey Budnevitch <sb@nginx.com> Wed, 22 Jan 2014 17:54:40 +0400 + -- Sergey Budnevitch <sb@nginx.com> Tue, 19 Nov 2013 15:52:19 +0400 -nginx (1.5.8-1) unstable; urgency=low +nginx (1.4.3-1) unstable; urgency=low - * 1.5.8 - - -- Sergey Budnevitch <sb@nginx.com> Tue, 17 Dec 2013 18:05:32 +0400 - -nginx (1.5.7-1) unstable; urgency=low - - * 1.5.7 + * 1.4.3 * init script now honours additional options sourced from /etc/default/nginx - -- Sergey Budnevitch <sb@nginx.com> Tue, 19 Nov 2013 15:59:56 +0400 + -- Sergey Budnevitch <sb@nginx.com> Tue, 08 Oct 2013 17:18:22 +0400 -nginx (1.5.6-1) unstable; urgency=low +nginx (1.4.2-1) unstable; urgency=low - * 1.5.6 - - -- Sergey Budnevitch <sb@nginx.com> Tue, 01 Oct 2013 16:35:33 +0400 - -nginx (1.5.5-1) unstable; urgency=low - - * 1.5.5 - - -- Andrei Belov <defan@nginx.com> Tue, 17 Sep 2013 17:40:00 +0400 - -nginx (1.5.4-1) unstable; urgency=low - - * 1.5.4 - * auth request module added - - -- Sergey Budnevitch <sb@nginx.com> Tue, 27 Aug 2013 15:00:00 +0400 - -nginx (1.5.3-1) unstable; urgency=low - - * 1.5.3 - - -- Sergey Budnevitch <sb@nginx.com> Tue, 30 Jul 2013 13:55:04 +0400 - -nginx (1.5.2-1) unstable; urgency=low - - * 1.5.2 - - -- Sergey Budnevitch <sb@nginx.com> Tue, 02 Jul 2013 17:27:00 +0400 - -nginx (1.5.1-1) unstable; urgency=low - - * 1.5.1 + * 1.4.2 * dpkg-buildflags options now passed by --with-{cc,ld}-opt - -- Sergey Budnevitch <sb@nginx.com> Tue, 04 Jun 2013 17:45:54 +0400 + -- Sergey Budnevitch <sb@nginx.com> Wed, 17 Jul 2013 17:32:00 +0400 -nginx (1.5.0-1) unstable; urgency=low +nginx (1.4.1-1) unstable; urgency=low - * 1.5.0 + * 1.4.1 * fixed openssl version detection with dash as /bin/sh - -- Sergey Budnevitch <sb@nginx.com> Tue, 06 May 2013 14:15:00 +0400 + -- Sergey Budnevitch <sb@nginx.com> Tue, 06 May 2013 14:05:00 +0400 -nginx (1.3.16-1) unstable; urgency=low +nginx (1.4.0-1) unstable; urgency=low - * 1.3.16 - - -- Sergey Budnevitch <sb@nginx.com> Tue, 16 Apr 2013 16:44:00 +0400 - -nginx (1.3.15-1) unstable; urgency=low - - * 1.3.15 + * 1.4.0 * gunzip module added * spdy module added if openssl version >= 1.0.1 + + -- Sergey Budnevitch <sb@nginx.com> Wed, 24 Apr 2013 17:17:00 +0400 + +nginx (1.2.8-1) unstable; urgency=low + + * 1.2.8 * set permissions on default log files at installation - -- Sergey Budnevitch <sb@nginx.com> Tue, 26 Mar 2013 19:05:00 +0400 + -- Sergey Budnevitch <sb@nginx.com> Tue, 02 Apr 2013 16:50:00 +0400 nginx (1.2.7-1) unstable; urgency=low
diff --git a/rpm/SPECS/nginx.spec b/rpm/SPECS/nginx.spec index e3c0f84..9060257 100644 --- a/rpm/SPECS/nginx.spec +++ b/rpm/SPECS/nginx.spec
@@ -45,7 +45,7 @@ Summary: High performance web server Name: nginx -Version: 1.7.2 +Version: 1.6.0 Release: 1%{?dist}.ngx Vendor: nginx inc. URL: http://nginx.org/ @@ -326,72 +326,45 @@ fi %changelog -* Tue Jun 17 2014 Sergey Budnevitch <sb@nginx.com> -- 1.7.2 - -* Tue May 27 2014 Sergey Budnevitch <sb@nginx.com> -- 1.7.1 +* Thu May 22 2014 Sergey Budnevitch <sb@nginx.com> - incorrect sysconfig filename finding in the initscript fixed * Thu Apr 24 2014 Konstantin Pavlov <thresh@nginx.com> -- 1.7.0 - -* Tue Apr 8 2014 Sergey Budnevitch <sb@nginx.com> -- 1.5.13 -- built spdy module on rhel/centos 6 +- 1.6.0 +- http-auth-request module added * Tue Mar 18 2014 Sergey Budnevitch <sb@nginx.com> -- 1.5.12 +- 1.4.7 - spec cleanup - openssl version dependence added - upgrade() function in the init script improved - warning added when binary upgrade returns non-zero exit code * Tue Mar 4 2014 Sergey Budnevitch <sb@nginx.com> -- 1.5.11 +- 1.4.6 -* Tue Feb 4 2014 Sergey Budnevitch <sb@nginx.com> -- 1.5.10 - -* Wed Jan 22 2014 Sergey Budnevitch <sb@nginx.com> -- 1.5.9 - -* Tue Dec 17 2013 Sergey Budnevitch <sb@nginx.com> -- 1.5.8 -- fixed invalid week days in the changelog +* Tue Feb 11 2014 Konstantin Pavlov <thresh@nginx.com> +- 1.4.5 * Tue Nov 19 2013 Sergey Budnevitch <sb@nginx.com> -- 1.5.7 +- 1.4.4 -* Tue Oct 1 2013 Sergey Budnevitch <sb@nginx.com> -- 1.5.6 +* Tue Oct 8 2013 Sergey Budnevitch <sb@nginx.com> +- 1.4.3 -* Tue Sep 17 2013 Andrei Belov <defan@nginx.com> -- 1.5.5 +* Tue Jul 17 2013 Sergey Budnevitch <sb@nginx.com> +- 1.4.2 -* Tue Aug 27 2013 Sergey Budnevitch <sb@nginx.com> -- 1.5.4 -- auth request module added +* Tue May 6 2013 Sergey Budnevitch <sb@nginx.com> +- 1.4.1 -* Tue Jul 30 2013 Sergey Budnevitch <sb@nginx.com> -- 1.5.3 - -* Tue Jul 2 2013 Sergey Budnevitch <sb@nginx.com> -- 1.5.2 - -* Tue Jun 4 2013 Sergey Budnevitch <sb@nginx.com> -- 1.5.1 - -* Mon May 6 2013 Sergey Budnevitch <sb@nginx.com> -- 1.5.0 - -* Tue Apr 16 2013 Sergey Budnevitch <sb@nginx.com> -- 1.3.16 - -* Tue Mar 26 2013 Sergey Budnevitch <sb@nginx.com> -- 1.3.15 +* Wed Apr 24 2013 Sergey Budnevitch <sb@nginx.com> - gunzip module added +- 1.4.0 + +* Tue Apr 2 2013 Sergey Budnevitch <sb@nginx.com> - set permissions on default log files at installation +- 1.2.8 * Tue Feb 12 2013 Sergey Budnevitch <sb@nginx.com> - excess slash removed from --prefix @@ -462,5 +435,5 @@ - 1.0.6 - replace "conf.d/*" config include with "conf.d/*.conf" in default nginx.conf -* Wed Aug 10 2011 Sergey Budnevitch +* Tue Aug 10 2011 Sergey Budnevitch - Initial release