[debian-edu-commits] debian-edu/ 01/01: Add lintian overrides for package-contains-file-in-etc-skel as we do this since more than a decade.

[Holger Levsen]

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

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

commit 5806c5d73a0f3dbf0c8819c756363f100beea208
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Jan 21 17:18:23 2018 +0000

    Add lintian overrides for package-contains-file-in-etc-skel as we do this since more than a decade.
    
    This reverts most of d546bf78..d051ed108, IOW: it only kepts an
    unrelated change in these commits.
    
    It's better to use lintian overrides and rely on dpkg/debhelper to
    create and remove those directories as needed, instead of adding custom
    code for this in postinst+postrm.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog                           |  8 ++++----
 debian/debian-edu-config.lintian-overrides | 11 ++++++++++-
 debian/debian-edu-config.postinst          |  4 ----
 debian/debian-edu-config.postrm            | 14 --------------
 debian/dirs                                |  4 ++++
 5 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 624997b..e8957f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,16 +4,16 @@ debian-edu-config (1.947) UNRELEASED; urgency=medium
   * debian/debian-edu-config.postrm: Also remove a generated cfengine3 config
     file. Thanks to Holger Levsen. (Closes: #887726).
   * Amend wording in two previous changelog entries.
-  * Don't ship files in /etc/skel to avoid lintian error.
-    - Remove related directories from debian/dirs.
-    - Create files in debian/debian-debian-edu-config.postinst.
-    - Remove them in debian/debian-debian-edu-config.postrm.
   * Fix typo debian-debian-edu-config.postinst (cfengine log file removal).
   * Adjust debian/debian-edu-config.lintian-overrides.
 
   [ Mike Gabriel ]
   * debian-edu-config/tools/gosa-*: White-space cleanups.
 
+  [ Holger Levsen ]
+  * Add lintian overrides for package-contains-file-in-etc-skel as we do this
+    since more than a decade.
+
  -- Wolfgang Schweer <wschweer at arcor.de>  Fri, 19 Jan 2018 16:42:59 +0100
 
 debian-edu-config (1.946) unstable; urgency=medium
diff --git a/debian/debian-edu-config.lintian-overrides b/debian/debian-edu-config.lintian-overrides
index 38d6cc4..de01e2d 100644
--- a/debian/debian-edu-config.lintian-overrides
+++ b/debian/debian-edu-config.lintian-overrides
@@ -3,10 +3,19 @@ debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/f
 debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/hostname
 debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/wpad-proxy-update
 debian-edu-config binary: command-with-path-in-maintainer-script postinst:51 /usr/bin/etckeeper
-debian-edu-config binary: command-with-path-in-maintainer-script postinst:293 /usr/bin/etckeeper
+debian-edu-config binary: command-with-path-in-maintainer-script postinst:289 /usr/bin/etckeeper
 debian-edu-config binary: non-standard-apache2-configuration-name debian-edu-config-doc.conf != debian-edu-config.conf
 debian-edu-config binary: debconf-is-not-a-registry usr/bin/ldap-debian-edu-install
 debian-edu-config binary: debconf-is-not-a-registry usr/share/debian-edu-config/d-i/finish-install
 debian-edu-config binary: debconf-is-not-a-registry usr/share/debian-edu-config/d-i/pre-pkgsel
 debian-edu-config binary: debconf-is-not-a-registry usr/share/debian-edu-config/tools/kerberos-kdc-init
 debian-edu-config binary: remove-of-unknown-diversion usr/bin/gtick postrm:18
+debian-edu-config binary: package-contains-file-in-etc-skel etc/skel/.local/
+debian-edu-config binary: package-contains-file-in-etc-skel etc/skel/.local/share/
+debian-edu-config binary: package-contains-file-in-etc-skel etc/skel/.mozilla/
+debian-edu-config binary: package-contains-file-in-etc-skel etc/skel/.mozilla/firefox/
+debian-edu-config binary: package-contains-file-in-etc-skel etc/skel/.mozilla/firefox/debian-edu.default/
+debian-edu-config binary: package-contains-file-in-etc-skel etc/skel/.pki/
+debian-edu-config binary: package-contains-file-in-etc-skel etc/skel/.pki/nssdb/
+debian-edu-config binary: package-contains-file-in-etc-skel etc/skel/.thunderbird/
+debian-edu-config binary: package-contains-file-in-etc-skel etc/skel/.thunderbird/debian-edu.default/
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index 3849056..3ad035a 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -202,10 +202,6 @@ configure)
     mkdir -p /var/lib/dovecot
     chmod 750 /var/lib/dovecot
     chown root:root /var/lib/dovecot
-    mkdir -p etc/skel/.local/share
-    mkdir -p etc/skel/.pki/nssdb
-    mkdir -p etc/skel/.thunderbird/debian-edu.default
-    mkdir -p etc/skel/.mozilla/firefox/debian-edu.default
     touch /var/lib/dovecot/auth_success
     if [ ! -d /var/lib/cfengine3/inputs/debian-edu ] ; then
         . /usr/share/debian-edu-config/tools/setup-cfengine3
diff --git a/debian/debian-edu-config.postrm b/debian/debian-edu-config.postrm
index c5d3f8a..c85ecf6 100644
--- a/debian/debian-edu-config.postrm
+++ b/debian/debian-edu-config.postrm
@@ -46,20 +46,6 @@ case "$1" in
 	if [ -e /var/lib/dovecot ] ; then
 	    rmdir --ignore-fail-on-non-empty /var/lib/dovecot
 	fi
-
-	# directories created in postinst
-	if [ -e /etc/skel/.local ] ; then
-            rm -rf /etc/skel/.local
-	fi
-	if [ -e /etc/skel/.pki ] ; then
-            rm -rf /etc/skel/.pki
-	fi
-	if [ -e /etc/skel/.thunderbird ] ; then
-            rm -rf /etc/skel/.thunderbird
-	fi
-	if [ -e /etc/skel/.mozilla ] ; then
-            rm -rf /etc/skel/.mozilla
-	fi
 esac
 
 #DEBHELPER#
diff --git a/debian/dirs b/debian/dirs
index 35f6cff..0d26e1e 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -17,6 +17,10 @@ etc/samba
 etc/samba/netlogon
 etc/slbackup/pre.d
 etc/slbackup-php
+etc/skel/.local/share
+etc/skel/.pki/nssdb
+etc/skel/.thunderbird/debian-edu.default
+etc/skel/.mozilla/firefox/debian-edu.default
 etc/X11/Xsession.d
 usr/bin
 usr/share/debian-edu-config/tools

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