diff -u squid-2.7.STABLE7/debian/changelog squid-2.7.STABLE7/debian/changelog --- squid-2.7.STABLE7/debian/changelog +++ squid-2.7.STABLE7/debian/changelog @@ -1,3 +1,11 @@ +squid (2.7.STABLE7-1ubuntu2) lucid; urgency=low + + * debian/patches/90-cf.data.ubuntu.dpatch: + - add example refresh pattern for debs + (foundations-lucid-local-repo-support spec) + + -- Michael Vogt Wed, 20 Jan 2010 12:01:18 +0100 + squid (2.7.STABLE7-1ubuntu1) lucid; urgency=low * Merge from debian testing, remaining changes: diff -u squid-2.7.STABLE7/debian/patches/00list squid-2.7.STABLE7/debian/patches/00list --- squid-2.7.STABLE7/debian/patches/00list +++ squid-2.7.STABLE7/debian/patches/00list @@ -6,2 +6,3 @@ 07-manpage +90-cf.data.ubuntu 99-ubuntu-ssl-cert-snakeoil only in patch2: unchanged: --- squid-2.7.STABLE7.orig/debian/patches/90-cf.data.ubuntu.dpatch +++ squid-2.7.STABLE7/debian/patches/90-cf.data.ubuntu.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 90-cf.data.ubuntu.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad squid-2.7.STABLE7~/src/cf.data.pre squid-2.7.STABLE7/src/cf.data.pre +--- squid-2.7.STABLE7~/src/cf.data.pre 2010-01-20 11:59:06.709996916 +0100 ++++ squid-2.7.STABLE7/src/cf.data.pre 2010-01-20 12:00:15.287493658 +0100 +@@ -3058,6 +3058,8 @@ + refresh_pattern ^gopher: 1440 0% 1440 + refresh_pattern -i (/cgi-bin/|\?) 0 0% 0 + refresh_pattern (Release|Package(.gz)*)$ 0 20% 2880 ++# example line deb packages ++#refresh_pattern (\.deb|\.udeb)$ 129600 100% 129600 + refresh_pattern . 0 20% 4320 + NOCOMMENT_END + DOC_END