← Back to branch summary

~clint-fewbar/ubuntu/natty/squid/fix-upgrades-after-reload

« back to all changes in this revision

Viewing changes to contrib/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short, Chuck Short
  • Date: 2010-07-02 13:43:09 UTC
  • mfrom: (1.1.18 upstream) (7.3.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100702134309-i8g2on09rm2blea1
Tags: 2.7.STABLE9-2ubuntu1
https://launchpad.net/bugs/268816
https://launchpad.net/bugs/503777
https://launchpad.net/bugs/543798
https://launchpad.net/bugs/580590
* 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 brin 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)
  + Dropped:
    + debian/patches/99-squid-capability.dpatch: No longer needed.
    + debian/patches/08-CVE-2010-0308.dpatch: No longer needed.
    + debian/patches/09-CVE-2010-0639.dpatch: No longer needed.

 [Chuck Short]
 * debian/squid.upstart: Re-add maxfds. (LP: #580590)

Show diffs side-by-side

added added

removed removed

Lines of Context:
contrib/Makefile.in
39
39
subdir = contrib
40
40
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
41
41
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
42
 
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
43
 
        $(top_srcdir)/configure.in
 
42
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \
 
43
        $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
44
44
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
45
45
        $(ACLOCAL_M4)
46
46
mkinstalldirs = $(install_sh) -d
98
98
LIBSASL = @LIBSASL@
99
99
LIB_DB = @LIB_DB@
100
100
LIB_EPOLL = @LIB_EPOLL@
101
 
LIB_LBER = @LIB_LBER@
102
101
LIB_LDAP = @LIB_LDAP@
103
102
LIB_MALLOC = @LIB_MALLOC@
104
103
LN = @LN@
110
109
MKDIR_P = @MKDIR_P@
111
110
MV = @MV@
112
111
NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@
 
112
NIS_LIBS = @NIS_LIBS@
113
113
NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@
114
114
OBJEXT = @OBJEXT@
115
115
OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@