[debian-edu-commits] debian-edu/ 01/01: Adjust cf/cups to manage the new config file.

[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 df0563d8a1afd9ab8cdb7c37a3cd00022d7c5aa5
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Aug 31 18:14:06 2014 +0200

    Adjust cf/cups to manage the new config file.
---
 cf/cf.cups       | 6 ++++++
 debian/changelog | 1 +
 2 files changed, 7 insertions(+)

diff --git a/cf/cf.cups b/cf/cf.cups
index 4dd1877..6984687 100644
--- a/cf/cf.cups
+++ b/cf/cf.cups
@@ -1,5 +1,11 @@
+shellcommands:
+
+  debian.installation::
+    "/bin/rm /etc/systemd/system/cups.socket.d/cupsd-listen.conf"
+
 links:
 
   debian.installation::
 
     /etc/cups/cupsd.conf ->! /etc/cups/cupsd-debian-edu.conf
+    /etc/systemd/system/cups.socket.d/cupsd-listen.conf ->! /etc/systemd/system/cups.socket.d/cupsd-listen-debian-edu.conf
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 441d002..e75ddac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ debian-edu-config (1.724) UNRELEASED; urgency=low
 
   * Add /etc/systemd/system/cups.socket.d/cupsd-listen-debian-edu.conf
     as additional cups config file to enable listening on www:631.
+  * Adjust cf/cups to manage the new config file.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Sun, 31 Aug 2014 18:02:19 +0200
 

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