~racb/ubuntu/+source/squid3/+git/merge-wip:merge

Last commit made on 2015-10-30
Get this branch:
git clone -b merge https://git.launchpad.net/~racb/ubuntu/+source/squid3/+git/merge-wip
Only Robie Basak can upload to this branch. If you are Robie Basak please log in for upload directions.

Branch merges

Branch information

Recent commits

39ba4db... by Robie Basak

Changelog for test merge

4e29201... by Robie Basak

Add lsb-release build dep

This should make the Debian-supplied code in debian/rules correctly supply
information to the build

e965082... by Robie Basak

Remove conffile for old upstart job Ubuntu delta

95af711... by Robie BAsak <email address hidden>

+ Add disabled by default AppArmor profile. Versioned dependency on init-system-helpers (>> 1.22ubuntu5) to ensure we have the apparmor-profile-load script at boot time. (LP: #1432683)

Conflicts:
 debian/control
 debian/rules
 debian/squid.install
 debian/squid3.preinst

eaa3806... by Robie BAsak <email address hidden>

+ debian/patches/90-cf.data.ubuntu.dpatch: - Add an example refresh pattern for debs. (foundations-lucid-local-report spec)

Conflicts:
 debian/patches/series

16b3a87... by Robie Basak

Run sarg-reports if present before rotating logs

2f6923c... by Robie BAsak <email address hidden>

- Use snakeoil certificates.

Conflicts:
 debian/control
 debian/patches/series

c057ea3... by Robie BAsak <email address hidden>

Add dep8 tests

Conflicts:
 debian/control

Adding Testsuite: header no longer required since dpkg-source >= 1.17.11 does it.

08466bc... by Robie Basak

Import version 3.5.10-1

Imported using git-dsc-commit.

b9750a2... by Robie Basak

Import version 3.5.6-1

Imported using git-dsc-commit.