-
Committer:
Bazaar Package Importer
-
Author(s):
Chuck Short
-
Date:
2008-06-18 12:09:23 UTC
-
mfrom:
(1.1.14 upstream)
-
Revision ID:
james.westby@ubuntu.com-20080618120923-ewllt4kt92ldtvbe
Tags: 2.7.STABLE2-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 bring in snakeoil certificates.
+ Modify maintainer value to match Debian-Maintainer-Field spec.
- debian/squid.rc
- Use squid -k to reload the squid confiration. (LP: #204474)