[Pkg-zsh-commits] [zsh] 01/01: Handle /usr/local/share/zsh with dh_usrlocal (Closes: #895153)

[Axel Beckert]

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

abe pushed a commit to branch debian
in repository zsh.

commit 1521c7d0f7e607b789564e819173e228e9475137
Author: Sven Joachim <svenjoac at gmx.de>
Date:   Sat Apr 7 23:05:21 2018 +0200

    Handle /usr/local/share/zsh with dh_usrlocal (Closes: #895153)
    
    The upstream Makefile installs the /usr/local/share/zsh/site-functions
    directory, so all that is needed is not to delete it later in
    debian/rules, after which dh_usrlocal magically handles the rest.
---
 debian/rules               |  1 -
 debian/zsh-common.postinst | 10 ----------
 debian/zsh-common.prerm    | 24 ------------------------
 3 files changed, 35 deletions(-)

diff --git a/debian/rules b/debian/rules
index 021d780..ba228ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,7 +92,6 @@ override_dh_auto_install-indep: build-dynamic
 	perl $(CURDIR)/Util/helpfiles Doc/zshbuiltins.1 debian/zsh-common/usr/share/zsh/help
 
 	cd obj && $(MAKE) install.fns DESTDIR=$(CURDIR)/debian/zsh-common
-	rm -r debian/zsh-common/usr/local
 
 	awk '/^#define FPATH_DIR/     { head=$$3;       gsub(/"/,"",head); };        \
              /^#define FPATH_SUBDIRS/ { $$1=""; $$2=""; gsub(/[" ]/,""); tail=$$0; } \
diff --git a/debian/zsh-common.postinst b/debian/zsh-common.postinst
deleted file mode 100644
index 601994b..0000000
--- a/debian/zsh-common.postinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-mkdir -m2775 -p /usr/local/share/zsh/site-functions && chown root:staff \
-               /usr/local/share/zsh/site-functions || true
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/zsh-common.prerm b/debian/zsh-common.prerm
deleted file mode 100644
index ffb0622..0000000
--- a/debian/zsh-common.prerm
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-    (remove|deconfigure)
-        rmdir /usr/local/share/zsh/site-functions || true
-        rmdir /usr/local/share/zsh || true
-    ;;
-    (upgrade)
-    ;;
-
-    (failed-upgrade)
-    ;;
-
-    (*)
-	echo "prerm called with unknown argument \`$1'" >&2
-	exit 0
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/zsh.git