~ubuntu-branches/ubuntu/maverick/squid/maverick

Viewing all changes in revision 35.

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2009-02-07 18:08:10 UTC
  • mfrom: (7.1.3 lenny)
  • Revision ID: james.westby@ubuntu.com-20090207180810-s8fsllp8nr94rb8j
Tags: 2.7.STABLE3-4.1ubuntu1
* Merge from debian unstable, remaining changes: LP: #326547
  - 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)
  - Only pass -j$(NUMJOBS) to "$(MAKE) all" and not in MAKEFLAGS as
    debian/rules isn't -j safe; see Debian #512512.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: