-
Committer:
Bazaar Package Importer
-
Author(s):
Chuck Short
-
Date:
2011-04-04 09:12:11 UTC
-
mfrom:
(7.3.7 sid)
-
Revision ID:
james.westby@ubuntu.com-20110404091211-pxhptkomjoz4c3k4
Tags: 2.7.STABLE9-4ubuntu1
* 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)
+ Simplify postinst script and use invoke-rc.d per policy. Also use
stop/start to make sure new job file is reloaded. (LP: #726348)