[debian-edu-commits] debian-edu/ 01/01: Add removal code for the bogus file to debian/debian-edu-config.postinst

[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 8c0dd280ad170b9364a019410dbd0724f25045ee
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Jan 25 17:57:55 2018 +0100

    Add removal code for the bogus file to debian/debian-edu-config.postinst
    
    Adjust debian/debian-edu-config.lintian-overrides.
---
 debian/changelog                           | 2 ++
 debian/debian-edu-config.lintian-overrides | 2 +-
 debian/debian-edu-config.postinst          | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3e2329e..027dfa2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ debian-edu-config (2.10.20) UNRELEASED; urgency=medium
       debian/debian-edu-config.lintian-overrides and Makefile.
   * Makefile: Fix man page installation related typo that caused a bogus file
     to be shipped in addition since a long time. (Closes: #887990)
+  * Add removal code for the bogus file to debian/debian-edu-config.postinst
+    and adjust debian/debian-edu-config.lintian-overrides.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 23 Jan 2018 15:00:57 +0100
 
diff --git a/debian/debian-edu-config.lintian-overrides b/debian/debian-edu-config.lintian-overrides
index cbce340..c1e9677 100644
--- a/debian/debian-edu-config.lintian-overrides
+++ b/debian/debian-edu-config.lintian-overrides
@@ -3,7 +3,7 @@ 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:291 /usr/bin/etckeeper
+debian-edu-config binary: command-with-path-in-maintainer-script postinst:296 /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
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index 3ad035a..53ce8f5 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -178,6 +178,11 @@ configure)
         fi
     fi
 
+    if dpkg --compare-versions "$2" le "2.10.19" && \
+        [ -f /usr/share/man/man1/.1.gz ] ; then
+	rm /usr/share/man/man1/.1.gz
+    fi
+
     if dpkg --compare-versions "$2" le "1.929" && dpkg --compare-versions "$2" ge "1.926" && \
         egrep -q "(Main-Server)" /etc/debian-edu/config ; then
 	rm /etc/apache2/mods-available/userdir.load

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