[Pkg-zsh-commits] [zsh] 02/02: Remove zsh-beta* transitional packages

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

    Remove zsh-beta* transitional packages
---
 debian/TODO.md               |  1 -
 debian/control               | 25 -------------------------
 debian/zsh-beta-doc.postinst | 28 ----------------------------
 debian/zsh-beta.links        |  2 --
 debian/zsh-beta.postinst     | 40 ----------------------------------------
 debian/zsh-beta.postrm       | 14 --------------
 debian/zsh-beta.preinst      | 22 ----------------------
 7 files changed, 132 deletions(-)

diff --git a/debian/TODO.md b/debian/TODO.md
index 4c6bc80..0eaba6b 100644
--- a/debian/TODO.md
+++ b/debian/TODO.md
@@ -4,7 +4,6 @@ Debian Zsh TODO
 After the Jessie-Release
 ------------------------
 
-* Remove zsh-beta* packages
 * Remove alternatives system properly
 
 Decisions
diff --git a/debian/control b/debian/control
index 6540bf1..5c63199 100644
--- a/debian/control
+++ b/debian/control
@@ -134,28 +134,3 @@ Description: shell with lots of features (debugging symbols)
  .
  This package contains gdb debugging symbols for the 'zsh'
  package.
-
-Package: zsh-beta
-Architecture: all
-Section: oldlibs
-Priority: extra
-Depends: zsh (>= 5),
-         zsh-common (= ${source:Version}),
-         ${misc:Depends}
-Suggests: zsh-beta-doc
-Description: transitional package to zsh
- The purpose of this package is solely the transition from the zsh-beta
- package to the zsh package. It can be safely removed if no more user
- has zsh-beta as login shell.
-
-Package: zsh-beta-doc
-Architecture: all
-Section: oldlibs
-Priority: extra
-Depends: zsh-common (= ${source:Version}),
-         zsh-doc,
-         ${misc:Depends}
-Description: transitional package to zsh-doc
- The purpose of this package is solely the transition from the
- zsh-beta-doc package to the zsh-doc package. It can be safely
- removed.
diff --git a/debian/zsh-beta-doc.postinst b/debian/zsh-beta-doc.postinst
deleted file mode 100644
index d3e45d4..0000000
--- a/debian/zsh-beta-doc.postinst
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-    (configure)
-        :
-    ;;
-    (abort-upgrade|abort-remove|abort-deconfigure)
-	exit 0
-    ;;
-    (*)
-	echo "postinst called with unknown argument \`$1'" >&2
-	exit 0
-    ;;
-esac
-
-# Replace documentation directory with symlink
-docdir="/usr/share/doc/zsh-beta-doc"
-if [ -d $docdir -a ! -L $docdir ]; then
-    if rmdir $docdir 2>/dev/null; then
-        ln -sf zsh-common $docdir
-    fi
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/zsh-beta.links b/debian/zsh-beta.links
deleted file mode 100644
index c8f5c8a..0000000
--- a/debian/zsh-beta.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/man/man1/zsh.1.gz /usr/share/man/man1/zsh-beta.1.gz
-/bin/zsh5 /bin/zsh-beta
diff --git a/debian/zsh-beta.postinst b/debian/zsh-beta.postinst
deleted file mode 100644
index bcb754b..0000000
--- a/debian/zsh-beta.postinst
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-    (configure)
-        :
-    ;;
-    (abort-upgrade|abort-remove|abort-deconfigure)
-	exit 0
-    ;;
-    (*)
-	echo "postinst called with unknown argument \`$1'" >&2
-	exit 0
-    ;;
-esac
-
-
-for conffile in zlogin zlogout zprofile zshenv zshrc; do
-    dpkg-maintscript-helper rm_conffile /etc/zsh-beta/$conffile 5 -- "$@"
-done
-if [ -d /etc/zsh-beta ]; then
-    rmdir /etc/zsh-beta || true
-fi
-
-update-alternatives --remove zsh-beta /usr/bin/zsh
-update-alternatives --remove zsh-beta /bin/zsh4
-update-alternatives --remove zsh-beta /bin/zsh5
-
-# Replace documentation directory with symlink
-docdir="/usr/share/doc/zsh-beta"
-if [ -d $docdir -a ! -L $docdir ]; then
-    if rmdir $docdir 2>/dev/null; then
-        ln -sf zsh-common $docdir
-    fi
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/zsh-beta.postrm b/debian/zsh-beta.postrm
deleted file mode 100644
index 95dbe4f..0000000
--- a/debian/zsh-beta.postrm
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-    (purge)
-        rmdir -p /usr/local/share/zsh-beta/site-functions || true
-        ;;
-    (remove)
-        remove-shell /bin/zsh-beta
-        ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/zsh-beta.preinst b/debian/zsh-beta.preinst
deleted file mode 100644
index a0d153c..0000000
--- a/debian/zsh-beta.preinst
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-    (upgrade|install)
-        :
-    ;;
-    (abort-upgrade|abort-remove|abort-deconfigure)
-	exit 0
-    ;;
-    (*)
-	echo "postinst called with unknown argument \`$1'" >&2
-	exit 0
-    ;;
-esac
-
-for conffile in zlogin zlogout zprofile zshenv zshrc; do
-    dpkg-maintscript-helper rm_conffile /etc/zsh-beta/$conffile 5 -- "$@"
-done
-
-#DEBHELPER#

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