diff options
author | Mehdi Dogguy <mehdi@debian.org> | 2010-01-09 11:40:57 +0100 |
---|---|---|
committer | Mehdi Dogguy <mehdi@debian.org> | 2010-01-09 11:44:18 +0100 |
commit | 7768aea74385c258f2db818c8f68834849819d77 (patch) | |
tree | 9776bc666faf8510c1e58a25fe2b79ab82537152 | |
parent | 44216f937dd558d68173d66aba2f2a964e70c0ef (diff) |
Update update-configure.patch
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | debian/patches/update-configure.patch | 14 |
2 files changed, 8 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 7b05434..b2b23cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ ocaml-bitstring (2.0.2-1) UNRELEASED; urgency=low + Remove fix_ARCH_ALIGN_INT64.dpatch: integrated upstream. + Remove add_dynlink.patch: fixed upstream. * Update 01-byte-compilation.dpatch + * Update update-configure.patch * Add myself to uploaders. * Remove DMUA flag, not needed anymore. diff --git a/debian/patches/update-configure.patch b/debian/patches/update-configure.patch index 85f1a3a..99ea36e 100644 --- a/debian/patches/update-configure.patch +++ b/debian/patches/update-configure.patch @@ -2,15 +2,15 @@ Index: ocaml-bitstring/configure =================================================================== --- ocaml-bitstring.orig/configure 2009-07-04 20:52:47.000000000 +0000 +++ ocaml-bitstring/configure 2009-07-04 20:57:41.000000000 +0000 -@@ -643,6 +643,7 @@ +@@ -643,6 +643,7 @@ DIFF TIME - pkg_cil - pkg_extlib + OCAML_PKG_cil + OCAML_PKG_extlib +CAMLP4OFOPT CAMLP4OF OCAMLFIND - OCAMLLIB -@@ -4609,8 +4610,8 @@ + OCAMLBUILD +@@ -5295,8 +5296,8 @@ { (exit 1); exit 1; }; } fi @@ -21,7 +21,7 @@ Index: ocaml-bitstring/configure { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CAMLP4OF+set}" = set; then -@@ -4626,7 +4627,7 @@ +@@ -5312,7 +5313,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then @@ -30,7 +30,7 @@ Index: ocaml-bitstring/configure $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -4647,8 +4648,49 @@ +@@ -5333,8 +5334,49 @@ fi |