[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Drop CUPS related workaround now that bug #977198 has been fixed

[Wolfgang Schweer]

Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu-config


Commits:
0519c6cb by Wolfgang Schweer at 2020-12-31T12:29:07+01:00
Drop CUPS related workaround now that bug #977198 has been fixed

Remove share/debian-edu-config/cups.service
Adjust Makefile and cf3/cf.workarounds

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


4 changed files:

- Makefile
- cf3/cf.workarounds
- debian/changelog
- − share/debian-edu-config/cups.service


Changes:

=====================================
Makefile
=====================================
@@ -324,7 +324,6 @@ install: install-testsuite
 
 	set -e ; for f in \
 		share/debian-edu-config/avahi.smb.service \
-		share/debian-edu-config/cups.service \
 		share/debian-edu-config/rsyslog-collector \
 		share/debian-edu-config/smb.conf.edu-site \
 		share/debian-edu-config/firefox-networked-prefs.js \


=====================================
cf3/cf.workarounds
=====================================
@@ -1,25 +1,16 @@
 bundle agent workarounds
 {
-# Add cups service override file, drop once cups bug 977198 has been fixed.
 # Create missing GOsa² related directory to avoid confusion just in case an
 # admin is setting up a system of type printer.
 
 vars:
 
-  "cups_file" string => "/usr/lib/systemd/cups.service.d/.";
   "gosa_file" string => "/var/spool/ppd/.";
 
 files:
 
   debian.server.installation::
 
-    "$(cups_file)"
-      create => "true";
-
-    "/usr/lib/systemd/cups.service.d/override.conf"
-      copy_from => local_cp("/usr/share/debian-edu-config/cups.service"),
-      perms => mog("644","root","root");
-
     "$(gosa_file)"
       create => "true";
 }


=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+debian-edu-config (2.11.42) UNRELEASED; urgency=medium
+
+  * Drop CUPS related workaround now that bug #977198 has been fixed:
+    - Remove share/debian-edu-config/cups.service.
+    - Adjust Makefile and cf3/cf.workarounds.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 31 Dec 2020 12:20:36 +0100
+
 debian-edu-config (2.11.41) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
share/debian-edu-config/cups.service deleted
=====================================
@@ -1,3 +0,0 @@
-[Unit]
-Description=CUPS Scheduler service dependencies update, see #977198
-After=nslcd.service



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/0519c6cb2de111cea3c5726cbc888f7f8aa48180

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/0519c6cb2de111cea3c5726cbc888f7f8aa48180
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20201231/c58903e8/attachment-0001.html>