diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2013-01-13 00:05:05 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2013-01-13 00:05:05 +0100 |
| commit | 5246fdaaeae27d1eaa06a34adb60f088dd9c5e66 (patch) | |
| tree | eb3fdd45e4078656e96398d688aab94dfb40bf6f | |
| parent | 6ca055adf51d9cfde78623211372677d53f47178 (diff) | |
| parent | b607fe2e3704e8f150b9c801b9c3246fef3e57f7 (diff) | |
| download | zsh-5246fdaaeae27d1eaa06a34adb60f088dd9c5e66.tar.gz zsh-5246fdaaeae27d1eaa06a34adb60f088dd9c5e66.zip | |
Merge branch 'debian' into abe/no-beta
Conflicts:
debian/rules
| -rw-r--r-- | debian/clean | 7 | ||||
| -rwxr-xr-x | debian/rules | 4 | ||||
| -rw-r--r-- | debian/zsh-dbg.postinst | 28 | ||||
| -rw-r--r-- | debian/zsh.postinst | 8 |
4 files changed, 45 insertions, 2 deletions
diff --git a/debian/clean b/debian/clean index d699adffe..515ff49b4 100644 --- a/debian/clean +++ b/debian/clean @@ -2,5 +2,12 @@ config.cache config.status config.status.lineno Doc/zsh.idx +Doc/Zsh/manmodmenu.yo +Doc/Zsh/modlist.yo +Doc/Zsh/modmenu.yo +Doc/version.yo +Doc/zsh*.1 +Doc/zsh.texi +META-FAQ build-arch build-indep diff --git a/debian/rules b/debian/rules index 09c3c4430..1154ac5e9 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f INSTALL = install -INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 +INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk @@ -124,7 +124,7 @@ binary-arch-dynamic: build-arch # functions dh_installexamples -pzsh-common -X.distfiles - cd debian/zsh-common/usr/share/doc/zsh-common/examples/; mv Example Functions + cd debian/zsh-common/usr/share/doc/zsh-common/examples/; mv Example Functions sed -i -e '1!b;s:^#!.*[ /]zsh:#!/bin/zsh:;s#/usr/local/bin#/usr/bin#' \ debian/zsh-common/usr/share/doc/zsh-common/examples/Misc/* diff --git a/debian/zsh-dbg.postinst b/debian/zsh-dbg.postinst new file mode 100644 index 000000000..dac01ba3b --- /dev/null +++ b/debian/zsh-dbg.postinst @@ -0,0 +1,28 @@ +#!/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-dbg" +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.postinst b/debian/zsh.postinst index c9be2ebbb..0224d5003 100644 --- a/debian/zsh.postinst +++ b/debian/zsh.postinst @@ -26,6 +26,14 @@ update-alternatives --install /bin/zsh zsh /bin/zsh5 50 \ 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 +# Replace documentation directory with symlink +docdir="/usr/share/doc/zsh" +if [ -d $docdir -a ! -L $docdir ]; then + if rmdir $docdir 2>/dev/null; then + ln -sf zsh-common $docdir + fi +fi + #DEBHELPER# exit 0 |