-
Committer:
Bazaar Package Importer
-
Author(s):
Chuck Short, Chuck Short
-
Date:
2010-07-02 13:43:09 UTC
-
mfrom:
(1.1.18 upstream)
(7.3.4 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20100702134309-i8g2on09rm2blea1
Tags: 2.7.STABLE9-2ubuntu1
* 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 brin 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)
+ Dropped:
+ debian/patches/99-squid-capability.dpatch: No longer needed.
+ debian/patches/08-CVE-2010-0308.dpatch: No longer needed.
+ debian/patches/09-CVE-2010-0639.dpatch: No longer needed.
[Chuck Short]
* debian/squid.upstart: Re-add maxfds. (LP: #580590)