[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.12.0-7-13-g0b471ac

Stephane Glondu steph at glondu.net
Fri Aug 12 19:59:32 UTC 2011


The following commit has been merged in the master branch:
commit 86ebdf552d8691759186e8046fbba13c806472a9
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Aug 12 21:17:19 2011 +0200

    Refresh patches

diff --git a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch
index 02f44e3..3d05dfc 100644
--- a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch
+++ b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch
@@ -9,7 +9,7 @@ code (bug#338437)
  1 files changed, 3 insertions(+), 1 deletions(-)
 
 diff --git a/configure b/configure
-index 37d46c2..fa96ef8 100755
+index 9be5199..236e016 100755
 --- a/configure
 +++ b/configure
 @@ -284,7 +284,8 @@ case "$bytecc,$host" in
diff --git a/debian/patches/0002-Call-ld-with-proper-flags.patch b/debian/patches/0002-Call-ld-with-proper-flags.patch
index b32b909..e1b4754 100644
--- a/debian/patches/0002-Call-ld-with-proper-flags.patch
+++ b/debian/patches/0002-Call-ld-with-proper-flags.patch
@@ -10,10 +10,10 @@ gcc.
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/configure b/configure
-index fa96ef8..40a78cb 100755
+index 236e016..d4287ed 100755
 --- a/configure
 +++ b/configure
-@@ -1639,7 +1639,7 @@ echo "DEBUGGER=$debugger" >> Makefile
+@@ -1643,7 +1643,7 @@ echo "DEBUGGER=$debugger" >> Makefile
  echo "CC_PROFILE=$cc_profile" >> Makefile
  echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile
  echo "PARTIALLD=$partialld" >> Makefile
diff --git a/debian/patches/0007-Natdynlink-works-on-powerpc-and-hurd-i386.patch b/debian/patches/0007-Natdynlink-works-on-powerpc-and-hurd-i386.patch
index ec90bbd..301b04b 100644
--- a/debian/patches/0007-Natdynlink-works-on-powerpc-and-hurd-i386.patch
+++ b/debian/patches/0007-Natdynlink-works-on-powerpc-and-hurd-i386.patch
@@ -14,7 +14,7 @@ Signed-off-by: Stephane Glondu <steph at glondu.net>
  1 files changed, 2 insertions(+), 1 deletions(-)
 
 diff --git a/configure b/configure
-index 40a78cb..dbad12d 100755
+index d4287ed..d6ba2e3 100755
 --- a/configure
 +++ b/configure
 @@ -620,13 +620,14 @@ if test $withsharedlibs = "yes"; then
diff --git a/debian/patches/0012-Make-objinfo-show-force_link-and-ccobjs-ccopts-when-.patch b/debian/patches/0012-Make-objinfo-show-force_link-and-ccobjs-ccopts-when-.patch
index 4656ac5..1832412 100644
--- a/debian/patches/0012-Make-objinfo-show-force_link-and-ccobjs-ccopts-when-.patch
+++ b/debian/patches/0012-Make-objinfo-show-force_link-and-ccobjs-ccopts-when-.patch
@@ -11,7 +11,7 @@ Forwarded: http://caml.inria.fr/mantis/view.php?id=5316
  1 files changed, 21 insertions(+), 4 deletions(-)
 
 diff --git a/tools/objinfo.ml b/tools/objinfo.ml
-index 4f467f2..89855da 100644
+index 4f467f2..b75b83a 100644
 --- a/tools/objinfo.ml
 +++ b/tools/objinfo.ml
 @@ -44,8 +44,12 @@ let print_name_crc (name, crc) =

-- 
OCaml packaging



More information about the Pkg-ocaml-maint-commits mailing list