← Back to branch summary

~ubuntu-branches/ubuntu/raring/nginx/raring-proposed

« back to all changes in this revision

Viewing changes to src/http/modules/ngx_http_random_index_module.c

  • Committer: Package Import Robot
  • Author(s): Kartik Mistry, Cyril Lavier, Michael Lustfield, Kartik Mistry
  • Date: 2012-03-04 10:31:21 UTC
  • mfrom: (1.1.30)
  • Revision ID: package-import@ubuntu.com-20120304103121-6rsh03osfl5d2w8x
Tags: 1.1.16-1
http://bugs.debian.org/658492
http://bugs.debian.org/660408
[Cyril Lavier]
* Modified the parallel build to avoid random FTBFS in Ubuntu.
* New upstream release.
* debian/modules:
  + Updated nginx-upload-progress to 0.8.3-2-g03cbf1f.
* debian/control:
  + Added myself as uploader.
  + Added libpam0g-dev to Build-Depends.
  + Use wrap-and-sort to wrap control file fields.

[Michael Lustfield]
* debian/nginx-common.postinst:
  + Changed postinst to not change permissions on all log files.
    (Closes: #658492)
* debian/rules:
  + Added Auth PAM module at debian/modules/nginx-auth-pam. (Closes: #660408)

[Kartik Mistry]
* debian/control:
  + Added conflict between -dbg packages as seen by Lintian.
  + Updated Standards-Version to 3.9.3
* debian/copyright:
  + Updated for copyright-format 1.0
  + Updated upstream copyright year and details.
* debian/rules:
  + Moved nginx-auth-pam module to nginx-full package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/http/modules/ngx_http_random_index_module.c
49
49
    NULL,                                  /* create server configuration */
50
50
    NULL,                                  /* merge server configuration */
51
51
 
52
 
    ngx_http_random_index_create_loc_conf, /* create location configration */
53
 
    ngx_http_random_index_merge_loc_conf   /* merge location configration */
 
52
    ngx_http_random_index_create_loc_conf, /* create location configuration */
 
53
    ngx_http_random_index_merge_loc_conf   /* merge location configuration */
54
54
};
55
55
 
56
56