[Pkg-zsh-commits] [zsh] 01/02: Remove zsh4 wrappers, they were only needed for Wheezy → Jessie

[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 b3f1e6e499a974c23ef55e9b040800619363b2dc
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sun Mar 8 12:15:36 2015 +0100

    Remove zsh4 wrappers, they were only needed for Wheezy → Jessie
---
 debian/TODO.md                      |  1 -
 debian/rules                        |  2 --
 debian/zsh-static.install           |  1 -
 debian/zsh-static.lintian-overrides |  3 ---
 debian/zsh.install                  |  1 -
 debian/zsh.lintian-overrides        |  3 ---
 debian/zsh4                         | 26 --------------------------
 7 files changed, 37 deletions(-)

diff --git a/debian/TODO.md b/debian/TODO.md
index 0cba719..4c6bc80 100644
--- a/debian/TODO.md
+++ b/debian/TODO.md
@@ -6,7 +6,6 @@ After the Jessie-Release
 
 * Remove zsh-beta* packages
 * Remove alternatives system properly
-* Remove zsh4* wrappers
 
 Decisions
 ---------
diff --git a/debian/rules b/debian/rules
index 8408b9c..f6cf14d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -203,8 +203,6 @@ binary-arch-static: build-static
 	dh_strip             -pzsh-static
 
 	mv debian/zsh-static/bin/zsh  debian/zsh-static/bin/zsh5-static
-	mv debian/zsh-static/bin/zsh4 debian/zsh-static/bin/zsh4-static
-	sed -e 's:#!/bin/zsh5:#!/bin/zsh5-static:' -i debian/zsh-static/bin/zsh4-static
 
 	dh_installchangelogs -pzsh-static
 
diff --git a/debian/zsh-static.install b/debian/zsh-static.install
index 1745655..51a7123 100644
--- a/debian/zsh-static.install
+++ b/debian/zsh-static.install
@@ -1,2 +1 @@
 obj-static/Src/zsh bin
-debian/zsh4 bin
diff --git a/debian/zsh-static.lintian-overrides b/debian/zsh-static.lintian-overrides
index 3293473..91d63bf 100644
--- a/debian/zsh-static.lintian-overrides
+++ b/debian/zsh-static.lintian-overrides
@@ -3,6 +3,3 @@ zsh-static: embedded-library bin/zsh5-static: ncurses
 zsh-static: package-contains-broken-symlink usr/share/man/man1/zsh5-static.1.gz zsh.1.gz
 # False positive
 zsh-static: spelling-error-in-binary bin/zsh5-static tEH the
-# Just a migration wrapper which is not meant to be used
-zsh-static: binary-without-manpage bin/zsh4-static
-zsh-static: unusual-interpreter bin/zsh4-static #!/bin/zsh5-static
diff --git a/debian/zsh.install b/debian/zsh.install
deleted file mode 100644
index a6113c5..0000000
--- a/debian/zsh.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/zsh4 bin
diff --git a/debian/zsh.lintian-overrides b/debian/zsh.lintian-overrides
index 32823ac..5cbb27b 100644
--- a/debian/zsh.lintian-overrides
+++ b/debian/zsh.lintian-overrides
@@ -2,6 +2,3 @@
 zsh: hardening-no-fortify-functions usr/lib*/zsh/*/zsh/zleparameter.so
 # False positive
 zsh: spelling-error-in-binary usr/lib/*/zsh/*/zsh/zle.so tEH the
-# Just a migration wrapper which is not meant to be used
-zsh: binary-without-manpage bin/zsh4
-zsh: unusual-interpreter bin/zsh4 #!/bin/zsh5
diff --git a/debian/zsh4 b/debian/zsh4
deleted file mode 100755
index 53065cf..0000000
--- a/debian/zsh4
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/zsh5 -f
-
-# This wrapper's sole purpose is to ease the migration of zsh's binary
-# location from /bin/zsh4 to /bin/zsh5 between Debian Wheezy and Jessie.
-#
-# See https://bugs.debian.org/707760 for reasoning, details and
-# discussion.
-
-if [[ "$0" == *zsh4* ]]; then
-    static=''
-    if [[ "$0" == *static* ]]; then
-        static=-static
-    fi
-
-    echo ""
-    echo "    ####"
-    echo "    ####  $0 is deprecated, please switch to /bin/zsh${static} (or /usr/bin/zsh)"
-    if [[ "$1" == "-l" || "$0" == -* ]]; then
-        echo '    ####  Use "chsh -s '"/bin/zsh${static}"'" to change your login shell'
-    fi
-    echo "    ####  This command ($0) will disappear eventually!"
-    echo "    ####"
-    echo ""
-fi 1>&2
-
-exec "/bin/zsh5${static}" "$@"

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