nginx-sid/debian
Christos Trochalakis f539cc0a49 Fix licence ordering
2015-08-24 15:35:03 +03:00
..
conf Sync cgi configs with upstream 2015-07-09 11:00:06 +03:00
help Upgrade to the latest mime.types 2014-08-27 17:04:31 +03:00
modules Update nginx-lua to v0.9.16 2015-07-01 17:15:20 +03:00
ngx-conf Fix Python 3 compatibility in ngx-conf 2015-04-09 17:58:12 -05:00
patches Remove already present openssl guard patch 2014-04-24 17:40:45 +03:00
source Drop nginx-naxsi packages 2014-09-18 12:46:10 +03:00
tests Add some simple autopkgtests 2014-09-03 15:10:06 +03:00
ufw Imported Debian patch 1.2.0-1 2012-05-08 07:55:38 +02:00
upstream Fix upstream signature verification 2014-02-25 15:01:20 +02:00
vim Adding missing files. 2015-01-11 16:05:59 -06:00
changelog New upstream release (1.9.4) 2015-08-24 15:33:52 +03:00
compat Renamed debian/nginx-common.service to debian/nginx-common.nginx.service. Set compat to 9, updated debhelper dependency 2013-10-11 22:08:59 +05:30
control Remove XS-Testsuite header 2015-06-22 13:02:45 +03:00
copyright Fix licence ordering 2015-08-24 15:35:03 +03:00
gbp.conf Make git-import-orig use pristine-tar by default 2013-11-20 01:01:48 +02:00
nginx-common.dirs Added vim syntax highlighting. 2015-01-11 16:00:56 -06:00
nginx-common.install Don't ship ngx-conf just yet 2015-06-12 14:51:06 +03:00
nginx-common.lintian-overrides Fix a few more issues with the new document root 2014-10-13 10:46:13 +03:00
nginx-common.NEWS Update NEWS entry version 2015-06-12 15:37:51 +03:00
nginx-common.nginx.default initscript: gracefully stop nginx by default 2014-10-13 10:46:17 +03:00
nginx-common.nginx.init initscript: Add some comments/hints 2015-06-17 11:18:53 +03:00
nginx-common.nginx.logrotate Switch postrotate to the initscript's rotate command 2014-10-17 15:06:22 +03:00
nginx-common.nginx.service Fix systemd graceful stopping issue 2014-10-13 10:46:17 +03:00
nginx-common.nginx.upstart Adding upstart script 2015-01-11 16:20:46 -06:00
nginx-common.postinst Remove /etc/nginx/naxsi-ui.conf conffile 2014-11-30 10:16:42 +02:00
nginx-common.postrm Remove /etc/nginx/naxsi-ui.conf conffile 2014-11-30 10:16:42 +02:00
nginx-common.preinst Remove /etc/nginx/naxsi-ui.conf conffile 2014-11-30 10:16:42 +02:00
nginx-common.README.Debian Add a list of important changes since wheezy to README.Debian 2014-12-01 13:12:00 +02:00
nginx-doc.docs Ship NEWS with nginx-common instead of nginx-doc 2013-12-10 16:42:57 +02:00
nginx-doc.examples Imported Debian patch 1.2.0-1 2012-05-08 07:55:38 +02:00
nginx-extras.install Make nginx-extras.install executable 2014-07-29 09:06:18 +00:00
nginx-extras.lintian-overrides Override false lintian spelling error warning 2013-10-15 12:33:15 +03:00
nginx-extras.manpages Build upstream manpages before shipping 2015-06-12 15:01:29 +03:00
nginx-extras.postinst Fix #735551, nginx should be started by default 2014-01-17 13:45:56 +02:00
nginx-extras.prerm Cleanup nginx-* prerm scripts 2014-01-17 14:20:07 +02:00
nginx-full.dirs Imported Debian patch 1.2.0-1 2012-05-08 07:55:38 +02:00
nginx-full.install Imported Debian patch 1.2.0-1 2012-05-08 07:55:38 +02:00
nginx-full.lintian-overrides Override false lintian spelling error warning 2013-10-15 12:33:15 +03:00
nginx-full.manpages Build upstream manpages before shipping 2015-06-12 15:01:29 +03:00
nginx-full.postinst Fix #735551, nginx should be started by default 2014-01-17 13:45:56 +02:00
nginx-full.prerm Cleanup nginx-* prerm scripts 2014-01-17 14:20:07 +02:00
nginx-light.dirs Imported Debian patch 1.2.0-1 2012-05-08 07:55:38 +02:00
nginx-light.install Imported Debian patch 1.2.0-1 2012-05-08 07:55:38 +02:00
nginx-light.lintian-overrides Override false lintian spelling error warning 2013-10-15 12:33:15 +03:00
nginx-light.manpages Build upstream manpages before shipping 2015-06-12 15:01:29 +03:00
nginx-light.postinst Fix #735551, nginx should be started by default 2014-01-17 13:45:56 +02:00
nginx-light.prerm Cleanup nginx-* prerm scripts 2014-01-17 14:20:07 +02:00
README.Packaging Update README.Packaging now that 1.6 is stable 2014-04-24 19:23:20 +03:00
rules Add thread pool support to nginx-full & nginx-extras 2015-06-21 21:24:55 +03:00
watch debian/watch: Search mainline versions for now 2015-06-12 15:02:38 +03:00

Debian Packaging
================

We use git-buildpackage for packaging. Our repository can be found at
git.debian.org:/git/collab-maint/nginx.git.

Workflow for Unstable
=====================

We use the standard git-buildpackage workflow.

Workflow for Experimental (not-active)
======================================

Now that nginx 1.6.0 is released there is no plan to package mainline 1.7
releases to experimental. The following guide is been kept as a reference.

--------

Nginx mainline releases (1.5.x series) are been packaged for experimental,
as they lack security support.

The workflow we use is based on the assumption that packaging work happens on
origin/master and experimental builds are a trivial patch away from that.

The direct consequense of treating experimental as a patchset for origin/master
is that the relevant branches are forced-pushed whenever we release a new
1.5.x version. In other words, **it is not safe to base your work on the
experimental branch**.

This is a brief description of our experimental branches and how we are using
them.

* experimental-base
  Force-pushed when origin/master changes.

  experimental-base tracks the changes needed for building the 1.5.x branch,
  such as new configure parameters, etc. On new 1.5.x releases, it is rebased
  on origin/master so it is always up-to-date with our latest packaging work.

* experimental
  Force-pushed on every 1.5.x release.

  This branch points to the latest 1.5.x release.
  Before release this branch is reset to experimental-base, and then merged
  with the new upstream-1.5 branch. Finally all the release specific changes
  are commited (changelog entry etc) and the build is made.

* upstream-1.5
  Force-pushed on every 1.5.x release.

  Before a new 1.5.x release the branch is reset to origin/upstream.
  This is a technicallity so we can avoid resolving conflicts when a new 1.4.x
  release happens between two experimental releases.

Older 1.5.x releases are not referenced by any branch, but they can be found by
the relevant debian/* tag.

3rd party experimental workflow
===============================

As we described, it is better not base you work on our forced-pushed
experimental branch. A better approach would be to maintain a custom-build
branch that is rebased to our latest experimental branch (basically git rebase
--onto the relevant commits should work).