lp:~ubuntu-branches/ubuntu/lucid/squid/lucid-201002101821

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/lucid/squid

No reviews requested

Diff: 231 lines (+180/-0) (has conflicts)

6 files modified

debian/changelog (+20/-0)
debian/patches/90-cf.data.ubuntu.dpatch (+19/-0)
debian/patches/99-fix-storeurl-move-temp.dpatch (+24/-0)
debian/patches/99-squid-capability.dpatch (+43/-0)
debian/rules (+4/-0)
debian/squid.upstart (+70/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

46. By Chuck Short on 2010-01-23

More upstart fixes

45. By Chuck Short on 2010-01-23

More upstart fixes

44. By Chuck Short on 2010-01-23

Fix upstart dir

43. By Chuck Short on 2010-01-23

debian/squid-capability.dpatch: Fix libcap compatibility issues.

42. By Chuck Short on 2010-01-22

Really fix the patch

41. By Chuck Short on 2010-01-22

Fix storeurl patch

40. By Chuck Short on 2010-01-22

* debian/patches/90-cf.data.ubuntu.dpatch:
  - add an example refresh pattern for debs
    (foundations-lucid-local-report spec)
* Dont bring down the buildd because the number of jobs
  is set wrong. (LP: #476953)
* debian/patches/99-fix-storeurl-move-temp.dpatch:
  - Fix bug with http 302 response moved temporarily. (LP: #503777)
* debian/squid.upstart, debian/rules: Convert initscripts to upstart.

39. By Chuck Short on 2009-11-06

* Merge from debian testing, 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)

38. By Kees Cook on 2009-08-20

debian/{control,rules}: add and enable hardened build for PIE
(Debian bug 542723).

37. By Mathias Gug on 2009-08-14

[ Bhavani Shankar ]
* Merge from debian unstable, remaining changes: (LP: #396472)
  - 99-ubuntu-ssl-cert-snakeoil:
    + src/cf.data.pre:
      * Add refrence to snakepil /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)