[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 2 commits: Fix typo in debian/changelog

[Wolfgang Schweer]

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


Commits:
9170cbab by Wolfgang Schweer at 2021-01-01T11:46:03+01:00
Fix typo in debian/changelog

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

- - - - -
a238e6f4 by Wolfgang Schweer at 2021-01-01T11:56:34+01:00
Remove leftover files from CUPS related workaround

Add code to debian/debian-edu-config.postinst to remove systemd override
directory and file. Thanks to Petter Reinholdtsen for the hint.

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

- - - - -


2 changed files:

- debian/changelog
- debian/debian-edu-config.postinst


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,11 @@
 debian-edu-config (2.11.42) UNRELEASED; urgency=medium
 
-..* sbin/debian-edu-pxeinstall: Use the Homeworld theme also for syslinux.
+  * sbin/debian-edu-pxeinstall: Use the Homeworld theme also for syslinux.
   * Drop CUPS related workaround now that bug #977198 has been fixed:
     - Remove share/debian-edu-config/cups.service.
     - Adjust Makefile and cf3/cf.workarounds.
+    - Add code to debian/debian-edu-config.postinst to remove systemd override
+      directory and file. Thanks to Petter Reinholdtsen for the hint.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 31 Dec 2020 12:20:36 +0100
 


=====================================
debian/debian-edu-config.postinst
=====================================
@@ -214,6 +214,10 @@ configure)
         rm -f /etc/samba/samba-domain-policy.ldif
         rm -f /etc/samba/smbaddclient.sh
     fi
+    # Remove leftover files from CUPS related workaround
+    if dpkg --compare-versions "$2" le "2.11.42" ; then
+        rm -rf /usr/lib/systemd/cups.service.d
+    fi
     ;;
 esac
 



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/7159e07c7f2bc6f1a1f6c22a312d4ab4105b8587...a238e6f43b38fc6aabbbe61c1975e58efd77baf3

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/7159e07c7f2bc6f1a1f6c22a312d4ab4105b8587...a238e6f43b38fc6aabbbe61c1975e58efd77baf3
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/20210101/3eba9285/attachment-0001.html>