[debian-edu-commits] debian-edu/ 01/01: Move debian-edu.js -> etc/firefox-esr/debian-edu.js as this is the location for syspref now.

[Wolfgang Schweer]

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

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

commit 5dbb15f16abd06ccd510388e2948c89efeb932b2
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Wed Jul 20 16:06:22 2016 +0200

    Move debian-edu.js -> etc/firefox-esr/debian-edu.js as this is the location for syspref now.
---
 Makefile                                                                | 2 +-
 .../browser/defaults/preferences => etc/firefox-esr}/debian-edu.js      | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 0141240..85b3c24 100644
--- a/Makefile
+++ b/Makefile
@@ -110,6 +110,7 @@ SYSCONFFILES = \
 	exim4/exim-ldap-client-v4.conf \
 	exim4/exim-ldap-server-v4.conf \
 	filesystems \
+	firefox-esr/debian-edu.js \
 	gosa/gosa.conf \
 	php/apache2/php-debian-edu.ini \
 	insserv/overrides/kdm \
@@ -452,7 +453,6 @@ install: install-testsuite
 		share/debian-edu-config/rsyslog-collector \
 		share/debian-edu-config/firefox-networked-prefs.js \
 		share/debian-edu-config/squid.conf \
-		share/firefox-esr/browser/defaults/preferences/debian-edu.js \
 		share/pam-configs/edu-group \
 		share/pam-configs/edu-umask \
 		share/perl5/Debian/Edu.pm \
diff --git a/share/firefox-esr/browser/defaults/preferences/debian-edu.js b/etc/firefox-esr/debian-edu.js
similarity index 100%
rename from share/firefox-esr/browser/defaults/preferences/debian-edu.js
rename to etc/firefox-esr/debian-edu.js

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