~ubuntu-branches/ubuntu/lucid/squid/lucid-updates

Viewing all changes in revision 37.

  • Committer: Bazaar Package Importer
  • Author(s): Mathias Gug, Bhavani Shankar
  • Date: 2009-08-14 18:14:47 UTC
  • Revision ID: james.westby@ubuntu.com-20090814181447-eblc49crbqvr8evu
Tags: 2.7.STABLE6-2ubuntu1
[ Bhavani Shankar ]
* Merge from debian unstable, remaining changes: (LP: #396472)
  - 99-ubuntu-ssl-cert-snakeoil:
    + src/cf.data.pre:
      * Add refrence to snakepil /etc/ssl
  - debian/control:
    + Add ssl-cert to Depends to bring in snakeoil certificates.
  - debian/logrotate: use sarg-reports rather than sarg-maint.
    (LP: #268816)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: