summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--debian/clean1
-rw-r--r--debian/compat2
-rw-r--r--debian/control4
-rwxr-xr-xdebian/rules23
-rw-r--r--debian/zsh-common.dirs1
-rw-r--r--debian/zsh-common.prerm24
-rw-r--r--debian/zsh-dbg.dirs1
-rw-r--r--debian/zsh-dbg.links1
-rw-r--r--debian/zsh-dev.dirs1
-rw-r--r--debian/zsh-static.dirs3
-rw-r--r--debian/zsh.dirs1
-rw-r--r--debian/zsh.links1
-rw-r--r--debian/zsh.lintian-overrides2
-rw-r--r--debian/zsh.prerm2
-rw-r--r--debian/zshrc54
15 files changed, 71 insertions, 50 deletions
diff --git a/debian/clean b/debian/clean
index 515ff49b4..ad41e85be 100644
--- a/debian/clean
+++ b/debian/clean
@@ -11,3 +11,4 @@ Doc/zsh.texi
META-FAQ
build-arch
build-indep
+stamp-h.in
diff --git a/debian/compat b/debian/compat
index 7f8f011eb..ec635144f 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index f484b1e01..2ef98f496 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: zsh
Section: shells
Priority: optional
Build-Depends: bsdmainutils,
- debhelper (>= 7~),
+ debhelper (>= 9~),
dh-autoreconf,
dpkg-dev (>= 1.16.1~),
ghostscript,
@@ -112,7 +112,7 @@ Package: zsh-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: zsh (= ${binary:Version}), zsh-common (= ${source:Version}), ${misc:Depends}
+Depends: zsh (= ${binary:Version}), ${misc:Depends}
Pre-Depends: dpkg (>= 1.15.6~)
Description: shell with lots of features (debugging symbols)
Zsh is a UNIX command interpreter (shell) usable as an
diff --git a/debian/rules b/debian/rules
index 1154ac5e9..b99da28bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,6 +91,7 @@ clean:
binary-indep: build-indep
dh_testdir
dh_testroot
+ dh_installdocs -pzsh-doc --link-doc=zsh-common
dh_installdirs -pzsh-doc
cd obj && $(MAKE) install.info DESTDIR=$(CURDIR)/debian/zsh-doc
@@ -99,7 +100,6 @@ binary-indep: build-indep
# Work around texi2html unfriendliness
sed -i -e 's/<BODY.*>/<BODY LANG="EN">/' debian/zsh-doc/usr/share/doc/zsh-doc/html/*.html
- dh_installdocs -pzsh-doc
dh_installchangelogs -pzsh-doc
dh_link -pzsh-beta -pzsh-beta-doc
dh_compress -pzsh-doc -pzsh-beta -pzsh-beta-doc -Xpdf
@@ -166,8 +166,9 @@ binary-arch-dynamic: build-arch
dh_shlibdeps -pzsh -pzsh-dbg -- \
-dDepends debian/zsh/bin/* \
-dRecommends debian/zsh/usr/lib/zsh/*/zsh/*.so
+
dh_installmenu -pzsh-common
- dh_installdocs -pzsh-common -pzsh-dbg
+ dh_installdocs -pzsh -pzsh-common -pzsh-dbg --link-doc=zsh-common
dh_installchangelogs -pzsh-common -pzsh-dbg ChangeLog
dh_lintian -pzsh -pzsh-common -pzsh-dbg
dh_compress -pzsh -pzsh-common -pzsh-dbg
@@ -175,7 +176,8 @@ binary-arch-dynamic: build-arch
dh_installdeb -pzsh -pzsh-common -pzsh-dbg
dh_md5sums -pzsh -pzsh-common -pzsh-dbg
dh_gencontrol -pzsh -pzsh-common -pzsh-dbg
- dh_builddeb -pzsh -pzsh-common -pzsh-dbg -- -Zxz
+ dh_builddeb -pzsh -pzsh-common -- -Zxz
+ dh_builddeb -pzsh-dbg
binary-arch-static: build-static
dh_testdir
@@ -184,23 +186,22 @@ binary-arch-static: build-static
dh_installdirs -pzsh-static
dh_lintian -pzsh-static
+ # Do not symlink /usr/share/doc/zsh-static to
+ # /usr/share/doc/zsh-common because zsh-static has a uniqe,
+ # generated README.Debian
+ dh_installdocs -pzsh-static
awk 'BEGIN { print "The following modules are statically-compiled into the static zsh binary:\n"; } /link=static/ { printf "%s (%s %s)\n", substr($$1,6), $$4, $$5; }' obj-static/config.modules >debian/zsh-static/usr/share/doc/zsh-static/README.Debian
dh_install -pzsh-static
mv debian/zsh-static/bin/zsh debian/zsh-static/bin/zsh5-static
- dh_shlibdeps -pzsh-static
- dh_strip -pzsh-static
- dh_link -pzsh-static
- dh_installdocs -pzsh-static
dh_installchangelogs -pzsh-static
dh_compress -pzsh-static
dh_fixperms -pzsh-static
dh_installdeb -pzsh-static
dh_md5sums -pzsh-static
dh_gencontrol -pzsh-static
- dh_builddeb -pzsh-static
-
+ dh_builddeb -pzsh-static -- -Zxz
binary-arch-dev: build-arch
dh_testdir
@@ -209,7 +210,7 @@ binary-arch-dev: build-arch
dh_installdirs -pzsh-dev
dh_install -pzsh-dev
cd debian/zsh-dev/usr/share/aclocal; mv aczshoot.m4 zshoot.m4
- dh_installdocs -pzsh-dev
+ dh_installdocs -pzsh-dev --link-doc=zsh-common
dh_installchangelogs -pzsh-dev
dh_compress -pzsh-dev
dh_fixperms -pzsh-dev
@@ -218,7 +219,7 @@ binary-arch-dev: build-arch
dh_gencontrol -pzsh-dev
dh_builddeb -pzsh-dev
-binary: binary-indep binary-arch
+binary: binary-indep binary-arch binary-arch-static binary-arch-dev
prebuild:
Util/preconfig
diff --git a/debian/zsh-common.dirs b/debian/zsh-common.dirs
index d37728bac..bf201bbea 100644
--- a/debian/zsh-common.dirs
+++ b/debian/zsh-common.dirs
@@ -1,4 +1,3 @@
etc/zsh
-usr/share/menu
usr/share/man
usr/share/zsh/help
diff --git a/debian/zsh-common.prerm b/debian/zsh-common.prerm
new file mode 100644
index 000000000..ffb0622e1
--- /dev/null
+++ b/debian/zsh-common.prerm
@@ -0,0 +1,24 @@
+#!/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
diff --git a/debian/zsh-dbg.dirs b/debian/zsh-dbg.dirs
deleted file mode 100644
index 4fbd1b17d..000000000
--- a/debian/zsh-dbg.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/debug/bin
diff --git a/debian/zsh-dbg.links b/debian/zsh-dbg.links
deleted file mode 100644
index 9900cfa7e..000000000
--- a/debian/zsh-dbg.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/doc/zsh-common /usr/share/doc/zsh-dbg
diff --git a/debian/zsh-dev.dirs b/debian/zsh-dev.dirs
index d21ae6547..804889085 100644
--- a/debian/zsh-dev.dirs
+++ b/debian/zsh-dev.dirs
@@ -1,4 +1,3 @@
usr/include/zsh
usr/share/zsh-dev
-usr/share/doc/zsh-dev
usr/share/aclocal
diff --git a/debian/zsh-static.dirs b/debian/zsh-static.dirs
index 6c6a9684b..ba077a403 100644
--- a/debian/zsh-static.dirs
+++ b/debian/zsh-static.dirs
@@ -1,4 +1 @@
bin
-usr/share/man/man1
-usr/share/doc/zsh-static
-usr/share/lintian/overrides
diff --git a/debian/zsh.dirs b/debian/zsh.dirs
index 05607ece4..ba077a403 100644
--- a/debian/zsh.dirs
+++ b/debian/zsh.dirs
@@ -1,2 +1 @@
bin
-usr/lib/zsh
diff --git a/debian/zsh.links b/debian/zsh.links
deleted file mode 100644
index 850eba7eb..000000000
--- a/debian/zsh.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/doc/zsh-common /usr/share/doc/zsh \ No newline at end of file
diff --git a/debian/zsh.lintian-overrides b/debian/zsh.lintian-overrides
index 6f2d4d2e1..60fec95bc 100644
--- a/debian/zsh.lintian-overrides
+++ b/debian/zsh.lintian-overrides
@@ -1,2 +1,2 @@
# Only one of many files affected -> likely a false positive
-zsh: hardening-no-fortify-functions usr/lib/zsh/5.0.2/zsh/zleparameter.so
+zsh: hardening-no-fortify-functions usr/lib*/zsh/5.0.2/zsh/zleparameter.so
diff --git a/debian/zsh.prerm b/debian/zsh.prerm
index a874e3881..d49ec4699 100644
--- a/debian/zsh.prerm
+++ b/debian/zsh.prerm
@@ -6,8 +6,6 @@ case "$1" in
(remove|deconfigure)
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
;;
(upgrade)
;;
diff --git a/debian/zshrc b/debian/zshrc
index 2e68181a1..84d644d8f 100644
--- a/debian/zshrc
+++ b/debian/zshrc
@@ -17,16 +17,17 @@ then
typeset -A key
key=(
- Home "${terminfo[khome]}"
- End "${terminfo[kend]}"
- Insert "${terminfo[kich1]}"
- Delete "${terminfo[kdch1]}"
- Up "${terminfo[kcuu1]}"
- Down "${terminfo[kcud1]}"
- Left "${terminfo[kcub1]}"
- Right "${terminfo[kcuf1]}"
- PageUp "${terminfo[kpp]}"
- PageDown "${terminfo[knp]}"
+ BackSpace "${terminfo[kbs]}"
+ Home "${terminfo[khome]}"
+ End "${terminfo[kend]}"
+ Insert "${terminfo[kich1]}"
+ Delete "${terminfo[kdch1]}"
+ Up "${terminfo[kcuu1]}"
+ Down "${terminfo[kcud1]}"
+ Left "${terminfo[kcub1]}"
+ Right "${terminfo[kcuf1]}"
+ PageUp "${terminfo[kpp]}"
+ PageDown "${terminfo[knp]}"
)
function bind2maps () {
@@ -49,28 +50,33 @@ then
done
}
- bind2maps emacs -- Home beginning-of-line
- bind2maps viins vicmd -- Home vi-beginning-of-line
- bind2maps emacs -- End end-of-line
- bind2maps viins vicmd -- End vi-end-of-line
- bind2maps emacs viins -- Insert overwrite-mode
- bind2maps vicmd -- Insert vi-insert
- bind2maps emacs -- Delete delete-char
- bind2maps viins vicmd -- Delete vi-delete-char
- bind2maps emacs viins vicmd -- Up up-line-or-history
- bind2maps emacs viins vicmd -- Down down-line-or-history
- bind2maps emacs -- Left backward-char
- bind2maps viins vicmd -- Left vi-backward-char
- bind2maps emacs -- Right forward-char
- bind2maps viins vicmd -- Right vi-forward-char
+ bind2maps emacs -- BackSpace backward-delete-char
+ bind2maps viins -- BackSpace vi-backward-delete-char
+ bind2maps vicmd -- BackSpace vi-backward-char
+ bind2maps emacs -- Home beginning-of-line
+ bind2maps viins vicmd -- Home vi-beginning-of-line
+ bind2maps emacs -- End end-of-line
+ bind2maps viins vicmd -- End vi-end-of-line
+ bind2maps emacs viins -- Insert overwrite-mode
+ bind2maps vicmd -- Insert vi-insert
+ bind2maps emacs -- Delete delete-char
+ bind2maps viins vicmd -- Delete vi-delete-char
+ bind2maps emacs viins vicmd -- Up up-line-or-history
+ bind2maps emacs viins vicmd -- Down down-line-or-history
+ bind2maps emacs -- Left backward-char
+ bind2maps viins vicmd -- Left vi-backward-char
+ bind2maps emacs -- Right forward-char
+ bind2maps viins vicmd -- Right vi-forward-char
# Make sure the terminal is in application mode, when zle is
# active. Only then are the values from $terminfo valid.
if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
function zle-line-init () {
+ emulate -L zsh
printf '%s' ${terminfo[smkx]}
}
function zle-line-finish () {
+ emulate -L zsh
printf '%s' ${terminfo[rmkx]}
}
zle -N zle-line-init
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-27 10:08:37 +0000