diff -Nru augeas-1.2.0/debian/changelog augeas-1.2.0/debian/changelog --- augeas-1.2.0/debian/changelog 2014-01-27 14:39:48.000000000 +0000 +++ augeas-1.2.0/debian/changelog 2014-06-06 10:01:02.000000000 +0000 @@ -1,3 +1,10 @@ +augeas (1.2.0-0ubuntu2) utopic; urgency=medium + + * d/p/squid3-path: add /etc/squid3/squid.conf as an acceptable path to the + squid lens (LP: #1310120). + + -- Robie Basak Fri, 06 Jun 2014 11:01:02 +0100 + augeas (1.2.0-0ubuntu1) trusty; urgency=low * New upstream release. diff -Nru augeas-1.2.0/debian/patches/series augeas-1.2.0/debian/patches/series --- augeas-1.2.0/debian/patches/series 2014-01-27 14:39:11.000000000 +0000 +++ augeas-1.2.0/debian/patches/series 2014-06-06 10:00:58.000000000 +0000 @@ -1 +1,2 @@ link-pthread.diff +squid3-path diff -Nru augeas-1.2.0/debian/patches/squid3-path augeas-1.2.0/debian/patches/squid3-path --- augeas-1.2.0/debian/patches/squid3-path 1970-01-01 00:00:00.000000000 +0000 +++ augeas-1.2.0/debian/patches/squid3-path 2014-06-06 10:00:58.000000000 +0000 @@ -0,0 +1,26 @@ +From 874a86c3c35e9cff46e676293e1ba4b35649f8c8 Mon Sep 17 00:00:00 2001 +From: Mykola Nikishov +Date: Tue, 11 Dec 2012 22:27:55 +0200 +Subject: [PATCH] Support configuration file for Squid 3 + +Origin: upstream, https://github.com/hercules-team/augeas/commit/874a86c3c35e9cff46e676293e1ba4b35649f8c8 +Bug-Ubuntu: https://launchpad.net/bugs/1310120 +Last-Update: 2014-04-30 +--- + lenses/squid.aug | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lenses/squid.aug b/lenses/squid.aug +index 9c53665..aacf787 100644 +--- a/lenses/squid.aug ++++ b/lenses/squid.aug +@@ -433,5 +433,6 @@ let extension_methods = indent . [ key "extension_methods" . spc + let lns = (comment|empty|entry|auth|acl|http_access|refresh_pattern|extension_methods)* + + let filter = incl "/etc/squid/squid.conf" ++ . incl "/etc/squid3/squid.conf" + + let xfm = transform lns filter +-- +1.9.1 +