diff -Nru zsh-4.3.10/debian/changelog zsh-4.3.10/debian/changelog --- zsh-4.3.10/debian/changelog 2010-06-30 19:28:29.000000000 +0530 +++ zsh-4.3.10/debian/changelog 2010-08-03 15:53:29.000000000 +0530 @@ -1,3 +1,11 @@ +zsh (4.3.10-14ubuntu1) maverick; urgency=low + + * Merge from debian unstable(LP: #612938). Remaining changes: + - debian/zshrc: Enable completions by default, unless + skip_global_compinit is set + + -- Bhavani Shankar Tue, 03 Aug 2010 15:51:55 +0530 + zsh (4.3.10-14) unstable; urgency=low * ZW#27804: don't hang on encountering invalid character in @@ -80,6 +88,27 @@ -- Clint Adams Sat, 24 Oct 2009 01:20:39 -0400 +zsh (4.3.10-5ubuntu3) lucid; urgency=low + + * Rebuild statically linked zsh binary against recent libc. + + -- Matthias Klose Sun, 18 Apr 2010 22:23:57 +0000 + +zsh (4.3.10-5ubuntu2) lucid; urgency=low + + * rebuild rest of main for armel armv7/thumb2 optimization; + UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2 + + -- Alexander Sack Sun, 07 Mar 2010 01:12:08 +0100 + +zsh (4.3.10-5ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #426837), remaining changes: + - debian/zshrc: Enable completions by default, unless + skip_global_compinit is set + + -- Simon Olofsson Tue, 08 Sep 2009 17:04:03 +0200 + zsh (4.3.10-5) unstable; urgency=low * Possible fix for an intermittent history segfault. closes: #535232. @@ -104,6 +133,14 @@ -- Clint Adams Fri, 10 Jul 2009 21:58:50 -0400 +zsh (4.3.10-2ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/zshrc: Enable completions by default, unless + skip_global_compinit is set + + -- Muharem Hrnjadovic Tue, 16 Jun 2009 16:04:38 +0200 + zsh (4.3.10-2) unstable; urgency=medium * Patch from Colin Watson to complete for for bzr switch. @@ -111,6 +148,14 @@ -- Clint Adams Tue, 02 Jun 2009 14:51:43 -0400 +zsh (4.3.10-1ubuntu1) karmic; urgency=low + + * Resynchronise with Debian. Remaining changes: + + debian/zshrc: Enable completions by default, unless + skip_global_compinit is set + + -- Colin Watson Tue, 02 Jun 2009 10:40:25 +0100 + zsh (4.3.10-1) unstable; urgency=low * New upstream version. @@ -133,6 +178,14 @@ -- Clint Adams Thu, 21 May 2009 21:25:43 -0400 +zsh (4.3.9-4ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/zshrc: Enable completions by default, unless + skip_global_compinit is set + + -- Kees Cook Sat, 28 Mar 2009 10:01:26 -0700 + zsh (4.3.9-4) unstable; urgency=low * ZW#26675: add POSIX_ALIASES option. closes: #516998. @@ -163,6 +216,14 @@ -- Clint Adams Sat, 28 Feb 2009 14:44:32 -0500 +zsh (4.3.9-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: LP: #314112 + + debian/zshrc: Enable completions by default, unless + skip_global_compinit is set. + + -- Bhavani Shankar Mon, 05 Jan 2009 22:27:10 +0530 + zsh (4.3.9-1) unstable; urgency=low * New upstream version. @@ -182,6 +243,19 @@ -- Clint Adams Mon, 29 Dec 2008 12:01:01 -0500 +zsh (4.3.6-7ubuntu1) jaunty; urgency=low + + * Merge from unstable, remaining changes: + + debian/zshrc: Enable completions by default, unless + skip_global_compinit is set (cf. LP: #16759). + * Dropped changes: + + Makefile.in: no need to disable running of autoconf if configure + is out of date (builds just fine anyway) + + debian/control: downgrade libcap2-dev: libcap2-dev is in main now, + so we can build with it. + + -- Stefan Potyra Wed, 12 Nov 2008 13:38:52 +0100 + zsh (4.3.6-7) unstable; urgency=medium * Add grep-excuses completion from Chris Lamb. closes: #494137. @@ -207,6 +281,22 @@ -- Clint Adams Wed, 16 Jul 2008 18:33:18 -0400 +zsh (4.3.6-4ubuntu1) intrepid; urgency=low + + * Merge from unstable (LP: #244373), remaining changes: + + Makefile.in: Disable rule which runs autoconf if configure is + out of date. + + debian/zshrc: Enable completions by default, unless + skip_global_compinit is set (cf. LP #16759). + + debian/control: Update maintainer field by Ubuntu policy. + * debian/control: Downgrade build-dependency against libcap2-dev + to libcap-dev, since libcap2-dev is only + available in universe. + * This version fixes the issues with the broken zshall manpage + w.o. further modification (LP: #243268). + + -- Stefan Potyra Tue, 01 Jul 2008 18:34:38 +0200 + zsh (4.3.6-4) unstable; urgency=medium * Tweak configure so that dpkg-dev setting CPPFLAGS to the null string @@ -221,6 +311,25 @@ -- Clint Adams Sat, 31 May 2008 13:14:20 -0400 +zsh (4.3.6-2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - Makefile.in: Disable rule which runs autoconf; + we don't want it to run during the build. + - debian/zshenv: Stop setting PATH, depend on new and shiny libpam-modules + which sets PATH for us. + - debian/zshrc: Enable completions by default. + - Change the maintainer address. + * remove the patch from debian/zshenv. It does only act if $PATH is + empty or likely to be unconfigured. If a local administrator really + wants PATH to default to "/bin:/usr/bin", he can be expected to modify + /etc/zshenv. + * debian/zshrc: Enable to local user to prevent enabling completions by + the global /etc/zshrc by setting the variable "skip_global_compinit=1" + in his ~/.zshenv. Patch based on proposal by Jay Berkenbilt. LP: #16759 + + -- Reinhard Tartler Wed, 21 May 2008 09:17:09 +0200 + zsh (4.3.6-2) unstable; urgency=medium * Complete .spx files after ogg123, thanks to Markus Waldeck. closes: @@ -495,6 +604,20 @@ -- Clint Adams Fri, 26 Oct 2007 15:22:39 -0400 +zsh (4.3.4-24ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Disable rule in top-level Makefile.in which runs autoconf; + we don't want it to run during the build. + - Disable further autoconf-invoking rules in mkmakemod.sh.in.in. + - Stop setting PATH, depend on new and shiny libpam-modules which sets + PATH for us. + - Enable completions by default. + - Change the maintainer address. + * remove autogenerated and unneeded hunks (po, files, etc.) + + -- Reinhard Tartler Thu, 25 Oct 2007 19:34:31 +0200 + zsh (4.3.4-24) unstable; urgency=low * Add completion for growisofs. @@ -566,6 +689,25 @@ -- Clint Adams Thu, 30 Aug 2007 18:31:25 -0400 +zsh (4.3.4-14ubuntu2) gutsy; urgency=low + + * Trigger rebuild for hppa + + -- LaMont Jones Thu, 04 Oct 2007 12:26:56 -0600 + +zsh (4.3.4-14ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - Disable rule in top-level Makefile.in which runs autoconf; + we don't want it to run during the build. + - Disable further autoconf-invoking rules in mkmakemod.sh.in.in. + - Stop setting PATH, depend on new and shiny libpam-modules which sets + PATH for us. + - Enable completions by default. + - Change the maintainer address. + + -- Timo Aaltonen Fri, 31 Aug 2007 12:27:14 +0300 + zsh (4.3.4-14) unstable; urgency=low * Ship md5sums for zsh-dev and zsh-dbg. @@ -637,6 +779,19 @@ -- Clint Adams Wed, 06 Jun 2007 12:55:43 -0400 +zsh (4.3.4-5ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - Disable rule in top-level Makefile.in which runs autoconf; + we don't want it to run during the build. + - Disable further autoconf-invoking rules in mkmakemod.sh.in.in. + - Stop setting PATH, depend on new and shiny libpam-modules which sets + PATH for us. + - Enable completions by default. + - Change the maintainer address. + + -- Timo Aaltonen Tue, 29 May 2007 12:51:42 +0300 + zsh (4.3.4-5) unstable; urgency=low * Clean up detritus from zsh-dev and zsh-dbg packages in @@ -652,6 +807,19 @@ -- Clint Adams Mon, 14 May 2007 15:50:00 -0400 +zsh (4.3.4-3ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable, remaining changes: + - Disable rule in top-level Makefile.in which runs autoconf; + we don't want it to run during the build. + - Disable further autoconf-invoking rules in mkmakemod.sh.in.in. + - Stop setting PATH, depend on new and shiny libpam-modules which sets + PATH for us. + - Enable completions by default. + * Change the maintainer address. + + -- Timo Aaltonen Thu, 10 May 2007 10:14:05 +0300 + zsh (4.3.4-3) unstable; urgency=low * Add Italian debconf templates translation from Luca Monducci. @@ -3365,3 +3533,4 @@ * Added Joey Hess's compctl example for dpkg to /usr/doc/zsh/examples -- Clint Adams Thu, 24 Jul 1997 13:42:49 -0400 + diff -Nru zsh-4.3.10/debian/control zsh-4.3.10/debian/control --- zsh-4.3.10/debian/control 2010-06-30 19:28:29.000000000 +0530 +++ zsh-4.3.10/debian/control 2010-08-03 15:51:48.000000000 +0530 @@ -1,8 +1,9 @@ Source: zsh Section: shells Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Clint Adams Build-Depends: texinfo, groff-base, libncursesw5-dev, texi2html (>= 1.76-3), libcap-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], bsdmainutils, libpcre3-dev, texlive-latex-base -Maintainer: Clint Adams Standards-Version: 3.8.4 Homepage: http://www.zsh.org/ Vcs-Git: git://git.debian.org/git/private/schizo/zsh.git diff -Nru zsh-4.3.10/debian/zshrc zsh-4.3.10/debian/zshrc --- zsh-4.3.10/debian/zshrc 2010-06-30 19:28:29.000000000 +0530 +++ zsh-4.3.10/debian/zshrc 2010-07-02 18:55:26.000000000 +0530 @@ -41,3 +41,11 @@ unalias run-help autoload run-help + +# If you don't want compinit called here, place the line +# skip_global_compinit=1 +# in your $ZDOTDIR/.zshenv or $ZDOTDIR/.zprofice +if [[ -z "$skip_global_compinit" ]]; then + autoload -U compinit + compinit +fi