diff options
author | Frank Terbeck <ft@bewatermyfriend.org> | 2011-02-24 22:06:32 +0100 |
---|---|---|
committer | Frank Terbeck <ft@bewatermyfriend.org> | 2011-03-02 18:55:25 +0100 |
commit | 6267bebca9193f5b1a14fd672dd9333a4ed9eb44 (patch) | |
tree | 26b1d96e84312defcd398d0bdbb5b7718958cd05 | |
parent | 6ced6e2c734b0f6921cee8bc06580409573636f4 (diff) | |
download | zsh-6267bebca9193f5b1a14fd672dd9333a4ed9eb44.tar.gz zsh-6267bebca9193f5b1a14fd672dd9333a4ed9eb44.zip |
Refreshing autotools patches for yodl3 fixes
This still keeps the patches out of the series file, but it is shows
that the at2quilt script works as indended even with manually added
patches.
-rw-r--r-- | debian/patches/deb_0000_at_configure.diff | 16 | ||||
-rw-r--r-- | debian/patches/deb_0001_at_config_h_in.diff | 4 |
2 files changed, 15 insertions, 5 deletions
diff --git a/debian/patches/deb_0000_at_configure.diff b/debian/patches/deb_0000_at_configure.diff index c1bf898f3..7d4602029 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 Thu, 24 Feb 2011 21:58:18 CET. +Created by `at2quilt' on Thu, 24 Feb 2011 22:03:49 CET. Note: Never *ever* refresh this patch. Things will break. Index: pkg-zsh/configure --- pkg-zsh.orig/configure 2011-01-31 20:40:34.619230074 +0100 -+++ pkg-zsh/configure 2011-02-24 21:58:18.000000000 +0100 -@@ -0,0 +1,14024 @@ ++++ pkg-zsh/configure 2011-02-24 22:03:49.000000000 +0100 +@@ -0,0 +1,14034 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. +# Generated by GNU Autoconf 2.67. @@ -633,6 +633,7 @@ Index: pkg-zsh/configure +TEXI2HTML +TEXI2PDF +PDFETEX ++YODL_OPTIONS +YODL +LN +AWK @@ -5151,6 +5152,15 @@ Index: pkg-zsh/configure +done +test -n "$YODL" || YODL=": yodl" + ++ ++YODL_OPTIONS='' ++if test "x$ac_cv_prog_YODL" = xyodl; then ++ case `yodl --version` in ++ *"version 3."*) YODL_OPTIONS='-L' ;; ++ esac ++fi ++ ++ +for ac_prog in pdfetex +do + # Extract the first word of "$ac_prog", so it can be a program name with args. diff --git a/debian/patches/deb_0001_at_config_h_in.diff b/debian/patches/deb_0001_at_config_h_in.diff index 17f4aca88..e12b562fe 100644 --- a/debian/patches/deb_0001_at_config_h_in.diff +++ b/debian/patches/deb_0001_at_config_h_in.diff @@ -1,12 +1,12 @@ Patch to generate `config.h.in'. -Created by `at2quilt' on Thu, 24 Feb 2011 21:58:18 CET. +Created by `at2quilt' on Thu, 24 Feb 2011 22:03:49 CET. Note: Never *ever* refresh this patch. Things will break. Index: pkg-zsh/config.h.in --- pkg-zsh.orig/config.h.in 2011-01-31 20:40:34.619230074 +0100 -+++ pkg-zsh/config.h.in 2011-02-24 21:58:18.000000000 +0100 ++++ pkg-zsh/config.h.in 2011-02-24 22:03:49.000000000 +0100 @@ -0,0 +1,1150 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + |