[debian-edu-commits] debian-edu/ 01/01: Move our squid3.conf to the correct Makefile block to avoid installing it with the execute bit. Thank you, lintian!

[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 f8b610168b37a87e06669488f1c42f0f0ca6d678
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Oct 10 13:52:26 2014 +0200

    Move our squid3.conf to the correct Makefile block to avoid installing it with the execute bit.  Thank you, lintian!
---
 Makefile         | 2 +-
 debian/changelog | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 28385d5..f1c7c33 100644
--- a/Makefile
+++ b/Makefile
@@ -390,7 +390,6 @@ 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 \
@@ -446,6 +445,7 @@ install: install-testsuite
 		share/debian-edu-config/rsyslog-collector \
 		share/debian-edu-config/iceweacel-networked-prefs.js \
 		share/debian-edu-config/default-ltsp-client-setup \
+		share/debian-edu-config/squid3.conf \
 		share/iceweasel/defaults/preferences/debian-edu.js \
 		share/pam-configs/edu-group \
 		share/pam-configs/edu-umask \
diff --git a/debian/changelog b/debian/changelog
index 0dcc19d..d472735 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ debian-edu-config (1.810) UNRELEASED; urgency=high
     is generated on the main server.
   * Change wpad-extract to use IP when testing, instead of
     www.debian.org which require access to the global DNS system.
+  * Move our squid3.conf to the correct Makefile block to avoid
+    installing it with the execute bit.  Thank you, lintian!
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 07 Oct 2014 12:47:06 +0200
 

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