~clint-fewbar/ubuntu/natty/squid/fix-upgrades-after-reload

Viewing all changes in revision 56.

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-09-27 23:31:35 UTC
  • mfrom: (7.3.5 sid)
  • Revision ID: james.westby@ubuntu.com-20100927233135-wji23rnm6z60s684
Tags: 2.7.STABLE9-2.1ubuntu1
* Merge from debian unstable.  Remaining changes:
  + 99-ubuntu-ssl-cert-snakeoil:
    - src/cf.data.pre:
      * Add reference to snakeoil /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)
   + debian/patches/99-fix-storeurl-move-temp.dpatch: Fix bug with 302 response moved
     temporarily. (LP: ##503777)
   + debian/squid.upstart, debian/rules: Convert initscripts to upstart.
   + debian/patches/90-cf.data.ubuntu.dpatch: Add an example refresh pattern for debs.
     (foundations-lucid-local-report spec)
   + debian/rules: Disable optimizations for arm. (LP: #543798)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: