~ubuntu-branches/ubuntu/saucy/squid3/saucy-proposed

Viewing all changes in revision 35.

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Ubuntu Merge-o-Matic
  • Date: 2012-01-30 10:24:33 UTC
  • mfrom: (21.2.10 sid)
  • Revision ID: package-import@ubuntu.com-20120130102433-3xusl5y4szkpbp9k
Tags: 3.1.18-1ubuntu1
[ Ubuntu Merge-o-Matic ]
* Merge from Debian testing.  Remaining changes:
  + debian/control:
    - Update maintainer.
  + debian/squid3.upstart, debian/rules, squid3.resolvconf,
    debian/squid3.postinst, debian/squid3.postrm, debian/squid3.preinst,
    debian/squid3.prerm: Convert init script to upstart
  + debian/control, debian/patches/99-ubuntu-ssl-cert-snakeoil: Use
   snakeoil certificates.
  + debian/logrotate: Use sar-reports rather than sarg-maint. (LP: #26616)
  + debian/patches/90-cf.data.ubuntu.dpatch: Add an example refresh pattern
    for debs. (foundations-lucid-local-report spec)
  + Add transitional dummy packages

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: