Please merge nginx 0.7.67-3 (universe) from Debian unstable (main)

lintian gives those errors:

E: nginx: dir-or-file-in-var-www var/www/nginx-default/
N:
N: Debian packages should not install files under /var/www. This is not one
N: of the /var directories in the File Hierarchy Standard and is under the
N: control of the local administrator. Packages should not assume that it
N: is the document root for a web server; it is very common for users to
N: change the default document root and packages should not assume that
N: users will keep any particular setting.
N:
N: Packages that want to make files available via an installed web server
N: should instead put instructions for the local administrator in a
N: README.Debian file and ideally include configuration fragments for
N: common web servers such as Apache.
N:
N: As an exception, packages are permitted to create the /var/www directory
N: due to its past history as the default document root, but should at most
N: copy over a default file in postinst for a new install. In this case,
N: please add a Lintian override.
N:
N: Refer to Filesystem Hierarchy Standard (The /var Hierarchy) for details.
N:
N: Severity: serious, Certainty: possible
N:
E: nginx: dir-or-file-in-var-www var/www/nginx-default/50x.html
E: nginx: dir-or-file-in-var-www var/www/nginx-default/index.html

I see that those errors where in the previous Ubuntu package too, is that acceptable ?

Those warnings apply to Debian, not the Ubuntu delta. This merge looks ok to me.

Oh, whoops. Correct.

I think changelog is misleading, fix_reloading_ipv6.diff has been in Debian since 0.7.65-5.

Also the changelog needs to mention those 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.

Also enabling of http_*_module is already done in Debian (and some are repeated by the Ubuntu diff), so please remove the repeats and update changelog accordingly.

Quoting Stefano from IRC:

"you can look at apache2.2-common's default-site installation method, as this
was inspired by apache2.2-common's old method
basically, don't have the deb install stuff there, but if there's nothing there
(fresh install) or old default site, you can copy a default site in"

By checking apache2.2-common package, I find that they install the default site
somewhere in /usr/share/<package>, then in the postinst they do some check, if the
conditions pass, they would copy that default site to /var/www/

But, Why was this /var/www change in the previous Ubuntu version also? Why was that accepted and why not this one?

Shall add changelog entries soon.

I was the one who made the last merge - it was the first my merge... I can confirm there is a mess in last changelog entry - not all ubuntu remeining changes was mentioned (as sad أحمد المحمودي (Ahmed El-Mahmoudy)), instead of that i mentioned 0.7.65-1ubuntu2 --> 0.7.67-2ubuntu1 changes.

Lst changelog entry for the 0.7.67-2ubuntu1 must be like that:

  * 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'.
   * Re-enable http_realip_module (debian/rules).
    Apparently got lost by accident for the 0.7 branch (Closes: #507419)
    LP: #268750

and those lines in debian/rules are duplicates:

--with-http_dav_module \
--with-http_gzip_static_module \
--with-http_realip_module \

Mikhail: ok, you fixed the changelog, but there's still the problem about install files in /var/www

nginx (0.7.67-3) unstable; urgency=low

  * debian/rules:
    + Readded the configure option --with-mail_ssl_module, Thanks to Roland
      Rosenfeld <email address hidden> (Closes: #590815)
  * debian/control:
    + Updated Standards-Version to 3.9.1 (no changes needed)

 -- Kartik Mistry <email address hidden> Thu, 29 Jul 2010 21:41:52 +0530

Changelog of debian release being merged ^^

Mikhail,
You go ahead with the merge.

Bilal, yes, you right. the problem with /var/www issue has old roots and anyway (without or with this merge) it still exists in repository. I think that for a start we may apply this merge to fix some minor mess with changelog and duplicates in debian/rules. It will not introduce any new problem just cleanup. To fix www-issue i think we need fill the new bug devoted that problem.

www issue related bug: 547267 (https://bugs.edge.launchpad.net/ubuntu/+source/nginx/+bug/547267)

Merging this packages doesn't make the situation worse.

This bug was fixed in the package nginx - 0.7.67-3ubuntu1

---------------
nginx (0.7.67-3ubuntu1) maverick; urgency=low

  * 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'.

nginx (0.7.67-3) unstable; urgency=low

  * debian/rules:
    + Readded the configure option --with-mail_ssl_module, Thanks to Roland
      Rosenfeld <email address hidden> (Closes: #590815)
  * debian/control:
    + Updated Standards-Version to 3.9.1 (no changes needed)
 -- Mikhail Turov <email address hidden> Mon, 16 Aug 2010 22:52:17 +0200