diff options
author | Axel Beckert <abe@deuxchevaux.org> | 2012-07-22 23:41:02 +0200 |
---|---|---|
committer | Axel Beckert <abe@deuxchevaux.org> | 2012-07-22 23:41:02 +0200 |
commit | 0e12e966be89c8923a56a6776f18ec7a3ab9d7dd (patch) | |
tree | 4d13384e41840d510adc4faee9365d68d5d48c57 | |
parent | 1b2323de4c48a5a207752712605d19284759de0f (diff) | |
download | zsh-0e12e966be89c8923a56a6776f18ec7a3ab9d7dd.tar.gz zsh-0e12e966be89c8923a56a6776f18ec7a3ab9d7dd.zip |
debian/*: /bin/zsh4 → /bin/zsh5, etc.
-rw-r--r-- | debian/menu | 2 | ||||
-rw-r--r-- | debian/postinst | 6 | ||||
-rw-r--r-- | debian/prerm | 4 | ||||
-rwxr-xr-x | debian/rules | 20 | ||||
-rw-r--r-- | debian/static.postinst | 2 | ||||
-rw-r--r-- | debian/static.prerm | 2 | ||||
-rw-r--r-- | debian/zsh-static.lintian-overrides | 4 |
7 files changed, 20 insertions, 20 deletions
diff --git a/debian/menu b/debian/menu index 274e4da90..a7cbd2d64 100644 --- a/debian/menu +++ b/debian/menu @@ -1 +1 @@ -?package(zsh):needs="text" section="Applications/Shells" title="Zsh" command="/bin/zsh4" +?package(zsh):needs="text" section="Applications/Shells" title="Zsh" command="/bin/zsh5" diff --git a/debian/postinst b/debian/postinst index 5216deb7b..88f042ac0 100644 --- a/debian/postinst +++ b/debian/postinst @@ -23,9 +23,9 @@ if test -x /usr/bin/update-menus ; then update-menus ; fi update-alternatives --remove zsh /usr/bin/zsh update-alternatives --remove ksh /usr/bin/zsh update-alternatives --remove ksh /bin/zsh4 -update-alternatives --install /bin/zsh zsh /bin/zsh4 50 \ - --slave /usr/bin/zsh zsh-usrbin /bin/zsh4 -update-alternatives --install /bin/rzsh rzsh /bin/zsh4 50 \ +update-alternatives --install /bin/zsh zsh /bin/zsh5 50 \ + --slave /usr/bin/zsh zsh-usrbin /bin/zsh5 +update-alternatives --install /bin/rzsh rzsh /bin/zsh5 50 \ --slave /usr/share/man/man1/rzsh.1.gz rzsh.1.gz /usr/share/man/man1/zsh.1.gz mkdir -m2775 -p /usr/local/share/zsh/site-functions && chown root:staff \ diff --git a/debian/prerm b/debian/prerm index e45371592..75ed305ae 100644 --- a/debian/prerm +++ b/debian/prerm @@ -4,8 +4,8 @@ set -e case "$1" in (remove|deconfigure) - update-alternatives --remove zsh /bin/zsh4 - update-alternatives --remove rzsh /bin/zsh4 + update-alternatives --remove zsh /bin/zsh5 + update-alternatives --remove rzsh /bin/zsh5 rmdir /usr/local/share/zsh/site-functions || true rmdir /usr/local/share/zsh || true ;; diff --git a/debian/rules b/debian/rules index e0dc144df..5eb585b87 100755 --- a/debian/rules +++ b/debian/rules @@ -212,17 +212,17 @@ endif debian/tmp/bin/$(package) -fc 'setopt extendedglob; for i in debian/tmp/'`cat obj/Src/zshpaths.temp`'; do zcompile -U -M $$i.zwc $$i/*~*.zwc(^/) ; chmod 644 $$i.zwc ; done' ifneq (zsh-beta,$(package)) - mv debian/tmp/bin/zsh debian/tmp/bin/zsh4 - rm debian/tmp/bin/zsh-4.[0-9]* - ln -s zsh.1.gz debian/tmp/usr/share/man/man1/zsh4.1.gz + mv debian/tmp/bin/zsh debian/tmp/bin/zsh5 + rm debian/tmp/bin/zsh-5.[0-9]* + ln -s zsh.1.gz debian/tmp/usr/share/man/man1/zsh5.1.gz for i in `find debian/tmp/usr/lib/zsh -type d | sed 's#^debian/tmp/##'`; \ do mkdir -p debian/tmp-dbg/usr/lib/debug/"$$i"; done - objcopy --only-keep-debug debian/tmp/bin/zsh4 \ - debian/tmp-dbg/usr/lib/debug/bin/zsh4.dbg - strip --remove-section=.comment --remove-section=.note debian/tmp/bin/zsh4 - objcopy --add-gnu-debuglink=debian/tmp-dbg/usr/lib/debug/bin/zsh4.dbg debian/tmp/bin/zsh4 + objcopy --only-keep-debug debian/tmp/bin/zsh5 \ + debian/tmp-dbg/usr/lib/debug/bin/zsh5.dbg + strip --remove-section=.comment --remove-section=.note debian/tmp/bin/zsh5 + objcopy --add-gnu-debuglink=debian/tmp-dbg/usr/lib/debug/bin/zsh5.dbg debian/tmp/bin/zsh5 for i in `find debian/tmp/usr/lib/zsh -name "*.so"`; \ do objcopy --only-keep-debug $$i debian/tmp-dbg/usr/lib/debug/`echo $$i | sed 's#^debian/tmp/##'`.debug; \ @@ -323,12 +323,12 @@ binary-arch-static: checkroot build-static $(INSTALL_FILE) debian/copyright debian/tmp-static/usr/share/doc/$(package)-static/copyright - $(INSTALL_PROGRAM) obj-static/Src/zsh debian/tmp-static/bin/zsh4-static - strip --remove-section=.comment --remove-section=.note debian/tmp-static/bin/zsh4-static + $(INSTALL_PROGRAM) obj-static/Src/zsh debian/tmp-static/bin/zsh5-static + strip --remove-section=.comment --remove-section=.note debian/tmp-static/bin/zsh5-static gzip -9f debian/tmp-static/usr/share/doc/$(package)-static/changelog.Debian cd debian/tmp-static && find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums - ln -s $(package).1.gz debian/tmp-static/usr/share/man/man1/zsh4-static.1.gz + ln -s $(package).1.gz debian/tmp-static/usr/share/man/man1/zsh5-static.1.gz ifneq (zsh-beta,$(package)) dpkg-shlibdeps -Tdebian/$(package)-static.substvars -dDepends debian/tmp-static/bin/* diff --git a/debian/static.postinst b/debian/static.postinst index 4bf276a3a..396c0fabe 100644 --- a/debian/static.postinst +++ b/debian/static.postinst @@ -19,6 +19,6 @@ case "$1" in ;; esac -update-alternatives --install /bin/zsh-static zsh-static /bin/zsh4-static 40 +update-alternatives --install /bin/zsh-static zsh-static /bin/zsh5-static 40 exit 0 diff --git a/debian/static.prerm b/debian/static.prerm index d41adf11d..b5404047c 100644 --- a/debian/static.prerm +++ b/debian/static.prerm @@ -4,7 +4,7 @@ set -e case "$1" in remove|deconfigure) - update-alternatives --remove zsh-static /bin/zsh4-static + update-alternatives --remove zsh-static /bin/zsh5-static ;; upgrade) ;; diff --git a/debian/zsh-static.lintian-overrides b/debian/zsh-static.lintian-overrides index 7e3c5116d..482cad4ba 100644 --- a/debian/zsh-static.lintian-overrides +++ b/debian/zsh-static.lintian-overrides @@ -1,2 +1,2 @@ -zsh-static: embedded-library bin/zsh4-static: libm -zsh-static: embedded-library bin/zsh4-static: ncurses +zsh-static: embedded-library bin/zsh5-static: libm +zsh-static: embedded-library bin/zsh5-static: ncurses |