ubuntu/+source/squid:applied/ubuntu/edgy

Last commit made on 2006-07-13
Get this branch:
git clone -b applied/ubuntu/edgy https://git.launchpad.net/ubuntu/+source/squid
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
applied/ubuntu/edgy
Repository:
lp:ubuntu/+source/squid

Recent commits

b4c26b6... by Anibal Monsalve Salazar on 2006-07-12

Import patches-applied version 2.6.1-3ubuntu1 to applied/ubuntu/edgy

Imported using git-ubuntu import.

Changelog parent: 02635d58b262c80127fd29f092d6c1258866c94e
Unapplied parent: 6d90e0c6dbaab39402c6a1807a501f61561db188

New changelog entries:
  * Resynchronise with Debian.
  * debian/rules
    - Removed debian/po/*.po~
  * debian/patches/48-kfreebsd-kqueue
    - Added user interface for kqueue() on GNU/kFreeBSD (Thanks to Petr
      Salinger) (Closes: #377873)
  * debian/rules
    - Disabled IPF support on GNU/kFreeBSD
    - Install RELEASENOTES.html in /usr/share/doc
  * debian/NEWS.Debian
    - Added notice on changes to configuration file and reference to the
      RELEASENOTES.html file (Closes: #377950)
  * debian/control
    - Added missing Build-Depends on libdb4.3-dev (Closes: #377473)

6d90e0c... by Anibal Monsalve Salazar on 2006-07-12

Import patches-unapplied version 2.6.1-3ubuntu1 to ubuntu/edgy

Imported using git-ubuntu import.

Changelog parent: 145446f7596f335b564f39f68bacee1b5e78bc8c

New changelog entries:
  * Resynchronise with Debian.
  * debian/rules
    - Removed debian/po/*.po~
  * debian/patches/48-kfreebsd-kqueue
    - Added user interface for kqueue() on GNU/kFreeBSD (Thanks to Petr
      Salinger) (Closes: #377873)
  * debian/rules
    - Disabled IPF support on GNU/kFreeBSD
    - Install RELEASENOTES.html in /usr/share/doc
  * debian/NEWS.Debian
    - Added notice on changes to configuration file and reference to the
      RELEASENOTES.html file (Closes: #377950)
  * debian/control
    - Added missing Build-Depends on libdb4.3-dev (Closes: #377473)

02635d5... by Martin Pitt on 2006-07-11

Import patches-applied version 2.6.1-1ubuntu2 to applied/ubuntu/edgy

Imported using git-ubuntu import.

Changelog parent: 1c1631e8e37cdc2b67370d2fb0ef701e52219b44
Unapplied parent: 145446f7596f335b564f39f68bacee1b5e78bc8c

New changelog entries:
  * Add libdb4.4-dev build dependency to fix FTBFS.

145446f... by Martin Pitt on 2006-07-11

Import patches-unapplied version 2.6.1-1ubuntu2 to ubuntu/edgy

Imported using git-ubuntu import.

Changelog parent: 256169dc22c44f2a05b052368f0e22a6b45a7326

New changelog entries:
  * Add libdb4.4-dev build dependency to fix FTBFS.

1c1631e... by Martin Pitt on 2006-07-10

Import patches-applied version 2.6.1-1ubuntu1 to applied/ubuntu/edgy

Imported using git-ubuntu import.

Changelog parent: e6588ac0fcd0880f1649c6a416a9cdb686556a8f
Unapplied parent: 256169dc22c44f2a05b052368f0e22a6b45a7326

New changelog entries:
  * Merge from Debian unstable.
  * New upstream version
    - removed patches that have been integrated upstream:
      debian/patches/47-httpreplydestroy.dpatch
  * debian/rules
    - Removed build time upgrade of autoconf since config.{sub,guess} has been
      updated upstream
    - Enabled epoll() support on Linux and Kqueue support on KFreeBSD
    - Enabled Linux TPROXY support for totally transparent proxy support
    - Removed Winbind-based helpers building. Winbind is not supported
      upstream anymore
    - Moved documentation to squid-common
  * debian/postinst
    - Fix configuration file for missing http_port directive
  * debian/control
    - Remove dependency on webmin-squid which is not in the archive anymore
    - Bumped Standards-Version to 3.7.2 (no change required)

256169d... by Martin Pitt on 2006-07-10

Import patches-unapplied version 2.6.1-1ubuntu1 to ubuntu/edgy

Imported using git-ubuntu import.

Changelog parent: 067fe7b78c281e300fe614e6f4d26fd90e7b793a

New changelog entries:
  * Merge from Debian unstable.
  * New upstream version
    - removed patches that have been integrated upstream:
      debian/patches/47-httpreplydestroy.dpatch
  * debian/rules
    - Removed build time upgrade of autoconf since config.{sub,guess} has been
      updated upstream
    - Enabled epoll() support on Linux and Kqueue support on KFreeBSD
    - Enabled Linux TPROXY support for totally transparent proxy support
    - Removed Winbind-based helpers building. Winbind is not supported
      upstream anymore
    - Moved documentation to squid-common
  * debian/postinst
    - Fix configuration file for missing http_port directive
  * debian/control
    - Remove dependency on webmin-squid which is not in the archive anymore
    - Bumped Standards-Version to 3.7.2 (no change required)

e6588ac... by Martin Pitt on 2006-07-06

Import patches-applied version 2.5.14-1ubuntu1 to applied/ubuntu/edgy

Imported using git-ubuntu import.

Changelog parent: fd0c4ca7ec5c0c08e57cdebd3617532b7a1a1577
Unapplied parent: 067fe7b78c281e300fe614e6f4d26fd90e7b793a

New changelog entries:
  * Merge from debian unstable.
  * Only Ubuntu change left: Use snakeoil SSL certificate.
  * New upstream release
  * debian/patches/47-httpreplydestroy
    - Added upstream patch fixing assertion failure in HttpReply.c
  * debian/{prerm,postinst}
    - Make squid restart in postinst instead of stopping in prerm
      (Closes: #252467)
  * debian/{rules,control}
    - Added build-time upgrade of config.{guess,sub} for GNU/kFreeBSD
      (Closes: #365211)
  * debian/po/ca.po
     - Added Catalan debconf translation thanks to Miguel Gea Milvaques
       (Closes: #365412)
  * New upstream release

067fe7b... by Martin Pitt on 2006-07-06

Import patches-unapplied version 2.5.14-1ubuntu1 to ubuntu/edgy

Imported using git-ubuntu import.

Changelog parent: 24707ac7e58153429384a94d131646298f7538ac

New changelog entries:
  * Merge from debian unstable.
  * Only Ubuntu change left: Use snakeoil SSL certificate.
  * New upstream release
  * debian/patches/47-httpreplydestroy
    - Added upstream patch fixing assertion failure in HttpReply.c
  * debian/{prerm,postinst}
    - Make squid restart in postinst instead of stopping in prerm
      (Closes: #252467)
  * debian/{rules,control}
    - Added build-time upgrade of config.{guess,sub} for GNU/kFreeBSD
      (Closes: #365211)
  * debian/po/ca.po
     - Added Catalan debconf translation thanks to Miguel Gea Milvaques
       (Closes: #365412)
  * New upstream release

fd0c4ca... by Adam Conrad on 2006-02-22

Import patches-applied version 2.5.12-4ubuntu2 to applied/ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: 09dee9d6409545325e780a5788a0a2304d472cb7
Unapplied parent: 24707ac7e58153429384a94d131646298f7538ac

New changelog entries:
  * Add 99-ubuntu-wbinfo_group.dpatch, to make wbinfo_group.pl work properly
    with Samba >= 3.0.21, which is in dapper (Closes: launchpad.net/29228)

24707ac... by Adam Conrad on 2006-02-22

Import patches-unapplied version 2.5.12-4ubuntu2 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: d1b29c6f2199810ed5f038f6b337affc5dcf29c7

New changelog entries:
  * Add 99-ubuntu-wbinfo_group.dpatch, to make wbinfo_group.pl work properly
    with Samba >= 3.0.21, which is in dapper (Closes: launchpad.net/29228)