[debian-edu-commits] debian-edu/ 01/01: Make sure to install our default squid3 configuration for cfengine to find it.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-config.

commit 9cad27cd53266cd0376442075a48f86e264f1843
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Tue Oct 7 08:07:58 2014 +0200

    Make sure to install our default squid3 configuration for cfengine to find it.
---
 Makefile         | 1 +
 debian/changelog | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/Makefile b/Makefile
index 02b1c3b..b5dd4d5 100644
--- a/Makefile
+++ b/Makefile
@@ -389,6 +389,7 @@ install: install-testsuite
 		share/debian-edu-config/tools/update-proxy-from-wpad \
 		share/debian-edu-config/tools/wpad-extract \
 		share/debian-edu-config/ltspfs-mounter-kde \
+		share/debian-edu-config/squid3.conf \
 		share/ltsp/get-ldap-ltsp-config \
 		share/ltsp/init-ltsp.d/08-edu-hostname \
 		share/ltsp/init-ltsp.d/60-edu-diskless-ws \
diff --git a/debian/changelog b/debian/changelog
index b6d1981..9e07c77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debian-edu-config (1.809) UNRELEASED; urgency=low
+
+  * Make sure to install our default squid3 configuration for cfengine
+    to find it.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Tue, 07 Oct 2014 08:07:03 +0200
+
 debian-edu-config (1.808) unstable; urgency=high
 
   * Fix typo in cf.apt breaking the installation.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git