diff options
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | debian/control | 22 | ||||
| -rw-r--r-- | debian/patches/replace-texi2html-with-makeinfo | 17 | ||||
| -rw-r--r-- | debian/patches/run-help.patch | 31 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rw-r--r-- | debian/patches/solaris-shared.patch | 12 | ||||
| -rwxr-xr-x | debian/rules | 7 |
7 files changed, 57 insertions, 46 deletions
diff --git a/debian/changelog b/debian/changelog index be29db3..71679a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +zsh (5.0.5-1+dyson1) unstable; urgency=medium + + * New upstream release + * Removed run-help.patch (use sed as in Debian) + * Added replace-texi2html-with-makeinfo (Debian) + * Refreshed solaris-shared.patch + * Updated build dependencies + * Set VCS fields to point to Dyson + * Updated invocation of helpfiles in d/rules + + -- Igor Pashev <pashev.igor@gmail.com> Thu, 06 Feb 2014 20:05:01 +0400 + zsh (4.3.17-1+dyson1) unstable; urgency=low * Initial release for Dyson. diff --git a/debian/control b/debian/control index 19c6a4e..c170055 100644 --- a/debian/control +++ b/debian/control @@ -1,16 +1,26 @@ Source: zsh Section: shells Priority: optional -Build-Depends: debhelper (>= 8), dh-autoreconf, - bsdmainutils, groff-base, libcap-dev [linux-any], - libncursesw5-dev, libpcre3-dev, texi2html (>= 1.76-3), texinfo, texlive-latex-base, yodl, - gawk +Build-Depends: bsdmainutils, + debhelper (>= 9~), + dh-autoreconf, + dpkg-dev (>= 1.16.2~), + ghostscript, + groff, + groff-base, + libcap-dev [linux-any], + libncursesw5-dev, + libpcre3-dev, + texinfo (>= 5~), + texlive-latex-recommended, + texlive-latex-base, + yodl Maintainer: Debian Zsh Maintainers <pkg-zsh-devel@lists.alioth.debian.org> Uploaders: Michael Prokop <mika@debian.org>, Axel Beckert <abe@debian.org>, Clint Adams <clint@debian.org>, Frank Terbeck <ft@bewatermyfriend.org>, Richard Hartmann <richih.mailinglist@gmail.com> Standards-Version: 3.9.3 Homepage: http://www.zsh.org/ -Vcs-Git: git://git.debian.org/collab-maint/zsh.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/zsh.git;a=summary +Vcs-Git: http://cgit.osdyson.org/zsh.git +Vcs-Browser: http://cgit.osdyson.org/zsh.git/ Package: zsh Architecture: any diff --git a/debian/patches/replace-texi2html-with-makeinfo b/debian/patches/replace-texi2html-with-makeinfo new file mode 100644 index 0000000..c738c14 --- /dev/null +++ b/debian/patches/replace-texi2html-with-makeinfo @@ -0,0 +1,17 @@ +Description: Replace deprecated texi2html with makeinfo +Forwarded: http://www.zsh.org/mla/workers/2013/msg00723.html +Author: Axel Beckert <abe@debian.org> + +Index: zsh/Doc/Makefile.in +=================================================================== +--- zsh.orig/Doc/Makefile.in 2013-12-02 15:26:29.000000000 +0100 ++++ zsh/Doc/Makefile.in 2013-12-02 15:26:29.000000000 +0100 +@@ -41,7 +41,7 @@ + MAKEINFO = makeinfo + TEXI2DVI = texi2dvi + DVIPS = dvips +-TEXI2HTML = @TEXI2HTML@ --output . --ifinfo --split=chapter --node-files ++TEXI2HTML = makeinfo --html --output . --ifinfo --split=chapter --node-files + + .SUFFIXES: .yo .1 + diff --git a/debian/patches/run-help.patch b/debian/patches/run-help.patch deleted file mode 100644 index cb61b62..0000000 --- a/debian/patches/run-help.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: zsh-new/Functions/Misc/run-help -=================================================================== ---- zsh-new.orig/Functions/Misc/run-help 2012-02-23 21:39:30.000000000 +0000 -+++ zsh-new/Functions/Misc/run-help 2012-06-01 09:39:23.201633945 +0000 -@@ -10,7 +10,7 @@ - - emulate -RL zsh - --local HELPDIR="${HELPDIR:-/usr/share/zsh/$ZSH_VERSION/help}" -+local HELPDIR="${HELPDIR:-/usr/share/zsh/help}" - - [[ $1 == "." ]] && 1="dot" - [[ $1 == ":" ]] && 1="colon" -@@ -29,7 +29,7 @@ - return 0 - elif [[ -n "${HELPDIR:-}" && -r $HELPDIR/$1 && $1 != compctl ]] - then -- ${=PAGER:-more} $HELPDIR/$1 -+ ${=PAGER:-/usr/bin/pager} $HELPDIR/$1 - return $? - fi - -@@ -65,7 +65,7 @@ - (comp*) man zshcompsys;; - (zf*) man zshftpsys;; - (run-help) man zshcontrib;; -- (*) builtin functions ${what[(w)1]} | ${=PAGER:-more};; -+ (*) builtin functions ${what[(w)1]} | ${=PAGER:-/usr/bin/pager};; - esac;; - (*( is a * builtin)) - case ${what[(w)1]} in diff --git a/debian/patches/series b/debian/patches/series index 1494ed6..c23bc1a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ solaris-shared.patch -run-help.patch +replace-texi2html-with-makeinfo diff --git a/debian/patches/solaris-shared.patch b/debian/patches/solaris-shared.patch index 47ab57a..111a978 100644 --- a/debian/patches/solaris-shared.patch +++ b/debian/patches/solaris-shared.patch @@ -1,10 +1,10 @@ -Index: zsh-new/configure.ac +Index: zsh/configure.ac =================================================================== ---- zsh-new.orig/configure.ac 2012-02-23 21:39:30.000000000 +0000 -+++ zsh-new/configure.ac 2012-05-31 23:01:56.935837293 +0000 -@@ -2689,7 +2689,8 @@ +--- zsh.orig/configure.ac 2014-01-05 22:24:59.000000000 +0400 ++++ zsh/configure.ac 2014-02-06 19:16:41.485449834 +0400 +@@ -2769,7 +2769,8 @@ + sunos*) DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;; sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;; - netbsd*) DLLDFLAGS="${DLLDFLAGS=${DLLDARG}-x -shared --whole-archive}" ;; aix*) DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;; - solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;; + solaris*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;; @@ -12,7 +12,7 @@ Index: zsh-new/configure.ac darwin*) DLLDFLAGS="${DLLDFLAGS=-bundle -flat_namespace -undefined suppress}" ;; beos*|haiku*) DLLDFLAGS="${DLLDFLAGS=-nostart}" ;; openbsd*) -@@ -2827,7 +2828,6 @@ +@@ -2907,7 +2908,6 @@ if test "x$dynamic" = xyes; then zsh_SHARED_VARIABLE([environ], [char **]) diff --git a/debian/rules b/debian/rules index 874dcaf..0edd6a4 100755 --- a/debian/rules +++ b/debian/rules @@ -34,9 +34,9 @@ override_dh_auto_install: cp Doc/zsh.pdf debian/tmp/usr/share/doc/zsh-doc/ - mkdir -p debian/tmp/usr/share/zsh/help nroff -mandoc -Tascii Doc/zshbuiltins.1 | colcrt - | \ - ( cd debian/tmp/usr/share/zsh/help && perl $(CURDIR)/Util/helpfiles ) + sed -e 's/±/{+|-}/' | \ + perl $(CURDIR)/Util/helpfiles /dev/stdin debian/tmp/usr/share/zsh/help mkdir -p debian/tmp/usr/include/zsh mkdir -p debian/tmp/usr/share/zsh-dev @@ -54,6 +54,9 @@ override_dh_auto_install: Src/ztype.h \ debian/tmp/usr/include/zsh/ + sed -i -e 's,^local HELPDIR=.*,local HELPDIR=$${HELPDIR:-/usr/share/zsh/help},; s,:-more,:-/usr/bin/pager,;' \ + debian/tmp/usr/share/zsh/functions/Misc/run-help + override_dh_strip: dh_strip --dbg-package=zsh-dbg |