lp:ubuntu/natty/nginx

Created by James Westby on 2010-10-13 and last modified on 2011-03-22
Get this branch:
bzr branch lp:ubuntu/natty/nginx
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Ubuntu branches
Status:
Mature

Recent revisions

39. By Michael Lustfield on 2011-03-03

[Micheal Lustfield]
* debian/nginx-{full,light,extras}.default:
  + Added comment about alternative to ULIMIT.
* debian/nginx-{full,light,extras}.init.d:
  + Added quotes around a test variable. (Closes: #610946, LP: #699736)
* debian/patches/609343-log-time-iso8601.diff:
  + Added patch to add $time_iso8601 variable to logs. (Closes: #609343)
* Clean up old logrotate files. (Closes: #608983, Closes: #610289)
  + Added Files:
    - debian/nginx-common.preinst
  + Modified Files:
    - debian/rules
  + Moved debian/nginx-common.logrotate to debian/logrotate.
* Added common files to nginx-common package. (Closes: #610290)
  + Removed Files:
    - debian/nginx-full.dirs
    - debian/nginx-light.dirs
    - debian/nginx-full.install
    - debian/nginx-light.install
    - debian/nginx-extras.install
    - debian/nginx.*
  + Added Files:
    - debian/nginx-common.default
    - debian/nginx-common.dirs
    - debian/nginx-common.init.d
    - debian/nginx-common.install
    - debian/nginx-common.manpages
    - debian/logrotate
  + Modified Files:
    - debian/nginx-extras.dirs
    - debian/control
    - debian/rules
* debian/nginx-*.install: (Closes: #609797)
  + Removed NEWS.Debian from nginx-{full,light,extras}.install.
  + Added NEWS.Debian to nginx-common.install.
* nginx-common.postinst:
  + Enforce /var/log/nginx mode and user:group. (Closes: #610983)
  + Enforce /var/log/nginx/*.log mode and user:group. (Closes: #612832)
* debian/rules:
  + Added --with-file-aio to nginx-extras. (Closes: #613175)
  + Removed split clients and user id modules from nginx-light.
* debian/conf/sites-available/default:
  + Fixed a minor typo ( s/Quickstart/QuickStart/ ). (Closes: #613355)
* debian/conf/mime.types:
  + Changed xml type to application/xhtml+xml. (Closes: #613851)
* debian/help/docs/fcgiwrap:
  + Removed Ubuntu specific line in docs. (Closes: #614987)
* debian/conf/sites-available/default:
  + Fixed a pointer to a file. (Closes: #614980)

[Kartik Mistry]
* debian/*.lintian-overrides:
  + Add Lintian overrides for nginx man page. We've manpage in nginx-common
    binary

38. By Kartik Mistry on 2010-12-06

[Kartik Mistry]
* debian/conf/mime.types:
  + Added html5 codecs support (Closes: #605212)
* debian/conf/fastcgi_params:
  + Fixed typo (Closes: #605582)

[Michael Lustfield]
* debian/conf/nginx.conf:
  + Reduced worker_connections to 768 (Closes: #605529)
* Add an nginx site management script to nginx-doc. (Closes: #593580)
  + debian/help/examples/nginx_modsite: Added.
* debian/nginx.logrotate:
  + Added prerotate chunk for awstats. (Closes: #590098)
* debian/copyright:
  + Added Michael Lustfield
* Created nginx-doc:
  + Added 'Package: nginx-doc' section to debian/control
  + Moved debian/nginx.examples -> debian/nginx-doc.examples
  + Moved debian/nginx.docs -> debian/nginx-doc.docs

37. By Bilal Akhtar on 2010-11-29

* Drop all Ubuntu changes that have landed in Debian in 0.8.53-1,
  except for:
  - debian/patches/nginx-html5-codecs.diff: Add support for html5 codecs.

36. By Bhavani Shankar on 2010-11-28

* Merge from debian unstable. Remaining changes:
  - Don't copy the default site directly into /var/www/ in the package,
    but instead keep it in /usr/share/nginx/nginx-default and move it to
   /var/www/nginx-default/ just after installation. (LP: #547267)
* debian/patches/nginx-html5-codecs.diff
  - Add support for html5 codecs (LP: #674224)

35. By Bilal Akhtar on 2010-11-02

Don't copy the default site directly into /var/www/ in the package,
but instead keep it in /usr/share/nginx/nginx-default and move it to
/var/www/nginx-default/ just after installation. (LP: #547267)

34. By Mikhail Turov on 2010-08-16

* Merge from debian testing. (LP: #616685) Remaining changes:
  - Add a UFW profile set:
    + debian/nginx.ufw.profile: Added.
    + debian/control: nginx: Suggests ufw.
    + debian/dirs: Add 'etc/ufw/applications.d'
    + debian/rules: Add install rule for the nginx UFW profile.
  - Install html files.
    - debian/dirs: Add 'var/www/nginx-default'.
    - debian/nginx.install: Add 'html/* var/www/nginx-default'.

33. By Daniel Holbach on 2010-07-22

* Merge from Debian unstable (LP: #608172) Remaining changes:
  + debian/rules:
    with-http_dav_module
    with-http_geoip_module
    with-http_gzip_static_module
    with-http_realip_module
    with-http_sub_module
  + .pc/applied-patches
    fix_reloading_ipv6.diff
* debian/conf/sites-available/default:
  + Removed reference to SSLv2 protocol (Closes: #589139)
* debian/control:
  + Updated Standards-Version to 3.9.0
* debian/copyright:
  + Don't point to BSD license file, included exact upstream version of
    license text
  + Added missing copyright owner for contrib/ scripts
  + debian/* license is same as upstream now as discussed with co-maintainers
* New upstream release
* debian/rules:
  + Enabled HTTPSubModule module in configure (Closes: #584828)
  + Arranged configure options in better manner
* debian/README.Debian:
  + Fixed typo and somewhat better wordings
* debian/conf/mime.types:
  + Added entry to support 7zip files (Closes: #580423)
* debian/init.d:
  + Do not print config testing info until an error found, Thanks to Ubuntu
    bug 568293
* debian/copyright:
  + Updated as per DEP-5 specification
* debian/patches/fix_reloading_ipv6.diff:
  + Added patch to fix reloading with IPv6 addresses, Thanks to
    Matthias-Christian Ott <email address hidden> for patch (Closes: #577456)
* debian/conf/sites-available/default:
  + Really listen for both IPv4 and IPv6 addresses. Thanks to Nikolaus
    Schulz <email address hidden> for notice (Closes: #574983)
* debian/control, debian/rules:
  + Added GeoIP support, Thanks to Caetano Carezzato
    <email address hidden> (Closes: #575280)
* debian/conf/mime.types:
  + Added svg entry to mime.types, Jeremy Lal <email address hidden>
    (Closes: #575155)
* Urgency set to medium due to Release Goal
* debian/conf/sites-available/default:
  + Listen for both IPv4 and IPv6 addresses by default (Closes: #574983)
* debian/README.Debian:
  + Added explanation about not installing files in /var/www/
    (Closes: #572513)
* debian/rules:
  + Readded realip module support (Closes: #507419)

32. By Daniel Holbach on 2010-07-22

Merging shared upstream rev into target branch.

31. By Daniel Hahler on 2010-03-05

Re-enable http_realip_module (debian/rules).
Apparently got lost by accident for the 0.7 branch (Closes: #507419)
LP: #268750

30. By Daniel Hahler on 2010-03-03

* Merge from debian testing. (LP: #531655) Remaining changes:
  - Add a UFW profile set:
    + debian/nginx.ufw.profile: Added.
    + debian/control: nginx: Suggests ufw.
    + debian/dirs: Add 'etc/ufw/applications.d'
    + debian/rules: Add install rule for the nginx UFW profile.
  - Install html files.
    - debian/dirs: Add 'var/www/nginx-default'.
    - debian/nginx.install: Add 'html/* var/www/nginx-default'.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:ubuntu/oneiric/nginx
This branch contains Public information 
Everyone can see this information.