diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/deb_0000_at_configure.diff | 55 | ||||
| -rw-r--r-- | debian/patches/deb_0001_at_config_h_in.diff | 11 |
3 files changed, 61 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index fe6150164..ad0d1fc38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +zsh (5.0.0-test-1-1) UNRELEASED; urgency=low + + * New upstream test release + + -- Axel Beckert <abe@debian.org> Mon, 17 Dec 2012 19:55:07 +0100 + zsh (5.0.0-2) experimental; urgency=low [ Michael Prokop ] diff --git a/debian/patches/deb_0000_at_configure.diff b/debian/patches/deb_0000_at_configure.diff index 2b8ad2682..417672b79 100644 --- a/debian/patches/deb_0000_at_configure.diff +++ b/debian/patches/deb_0000_at_configure.diff @@ -1,13 +1,13 @@ Patch to generate `configure'. -Created by `at2quilt' on Sun, 22 Jul 2012 21:40:59 CEST. +Created by `at2quilt' on Mon, 17 Dec 2012 19:52:25 CET. Note: Never *ever* refresh this patch. Things will break. Index: zsh/configure ---- zsh.orig/configure 2012-07-22 20:34:16.849614008 +0200 -+++ zsh/configure 2012-07-22 21:40:56.000000000 +0200 -@@ -0,0 +1,14244 @@ +--- zsh.orig/configure 2012-08-28 23:14:52.354229351 +0200 ++++ zsh/configure 2012-12-17 19:52:24.000000000 +0100 +@@ -0,0 +1,14285 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. +# Generated by GNU Autoconf 2.69. @@ -5222,7 +5222,8 @@ Index: zsh/configure +YODL_OPTIONS='' +if test "x$ac_cv_prog_YODL" = xyodl; then + case `yodl --version` in -+ *"version 3."*) YODL_OPTIONS='-L' ;; ++ *"version 2."*) YODL_OPTIONS='-k' ;; ++ *"version 3."*) YODL_OPTIONS='-k -L' ;; + esac +fi + @@ -9635,6 +9636,42 @@ Index: zsh/configure + +fi + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_NTHR" >&5 ++$as_echo_n "checking for limit RLIMIT_NTHR... " >&6; } ++if ${zsh_cv_have_RLIMIT_NTHR+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++#include <sys/types.h> ++#ifdef HAVE_SYS_TIME_H ++#include <sys/time.h> ++#endif ++#include <sys/resource.h> ++int ++main () ++{ ++RLIMIT_NTHR ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ zsh_cv_have_RLIMIT_NTHR=yes ++else ++ zsh_cv_have_RLIMIT_NTHR=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_have_RLIMIT_NTHR" >&5 ++$as_echo "$zsh_cv_have_RLIMIT_NTHR" >&6; } ++ ++if test $zsh_cv_have_RLIMIT_NTHR = yes; then ++ $as_echo "#define HAVE_RLIMIT_NTHR 1" >>confdefs.h ++ ++fi ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_NOFILE" >&5 +$as_echo_n "checking for limit RLIMIT_NOFILE... " >&6; } +if ${zsh_cv_have_RLIMIT_NOFILE+:} false; then : @@ -11616,6 +11653,10 @@ Index: zsh/configure + DLLD="${DLLD=$CC}" + DLLDARG="" + ;; ++ *interix*) ++ DLLD="${DLLD=$CC}" ++ DLLDARG="" ++ ;; + * ) + DLLD="${DLLD=ld}" + DLLDARG="" @@ -11626,6 +11667,7 @@ Index: zsh/configure + case "$host_os" in + hpux*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;; + darwin*) DLCFLAGS="${DLCFLAGS=-fno-common}" ;; ++ interix*) DLCFLAGS="${DLCFLAGS=}" ;; + *) DLCFLAGS="${DLCFLAGS=-fPIC}" ;; + esac + else @@ -11640,10 +11682,9 @@ Index: zsh/configure + fi + case "$host_os" in + osf*) DLLDFLAGS="${DLLDFLAGS=-shared -expect_unresolved '*'}" ;; -+ *freebsd*|linux*|irix*|gnu*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;; ++ *freebsd*|*netbsd*|linux*|irix*|gnu*|interix*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;; + 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}" ;; + darwin*) DLLDFLAGS="${DLLDFLAGS=-bundle -flat_namespace -undefined suppress}" ;; diff --git a/debian/patches/deb_0001_at_config_h_in.diff b/debian/patches/deb_0001_at_config_h_in.diff index 8774a72f4..696848344 100644 --- a/debian/patches/deb_0001_at_config_h_in.diff +++ b/debian/patches/deb_0001_at_config_h_in.diff @@ -1,13 +1,13 @@ Patch to generate `config.h.in'. -Created by `at2quilt' on Sun, 22 Jul 2012 21:40:59 CEST. +Created by `at2quilt' on Mon, 17 Dec 2012 19:52:25 CET. Note: Never *ever* refresh this patch. Things will break. Index: zsh/config.h.in ---- zsh.orig/config.h.in 2012-07-22 20:34:16.849614008 +0200 -+++ zsh/config.h.in 2012-07-22 21:40:58.000000000 +0200 -@@ -0,0 +1,1176 @@ +--- zsh.orig/config.h.in 2012-08-28 23:14:52.354229351 +0200 ++++ zsh/config.h.in 2012-12-17 19:52:25.000000000 +0100 +@@ -0,0 +1,1179 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/***** begin user configuration section *****/ @@ -530,6 +530,9 @@ Index: zsh/config.h.in +/* Define to 1 if RLIMIT_NPROC is present (whether or not as a macro). */ +#undef HAVE_RLIMIT_NPROC + ++/* Define to 1 if RLIMIT_NTHR is present (whether or not as a macro). */ ++#undef HAVE_RLIMIT_NTHR ++ +/* Define to 1 if RLIMIT_PTHREAD is present (whether or not as a macro). */ +#undef HAVE_RLIMIT_PTHREAD + |