[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.11.0-5-19-g72115cf

Stephane Glondu steph at glondu.net
Wed Jun 3 11:16:00 UTC 2009 

The following commit has been merged in the master branch:
commit 72115cfdcc64124457df76b5747aaa45af8cf328
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jun 3 13:14:39 2009 +0200

    New upstream release candidate, update patches

diff --git a/debian/changelog b/debian/changelog
index 77ed813..c2daba0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ocaml (3.11.1~rc0-1) UNRELEASED; urgency=low
+ocaml (3.11.1~rc1-1) UNRELEASED; urgency=low
 
   [ Samuel Mimram ]
   * Add kfreebsd-amd64 to the list of supported native architectures.
@@ -15,10 +15,10 @@ ocaml (3.11.1~rc0-1) UNRELEASED; urgency=low
   [ Stephane Glondu ]
   * New upstream release candidate:
     - remove dbm_ldopts.dpatch (merged upstream)
+    - remove ocamldoc_natdynlink.dpatch (merged upstream)
     - switch patch system to quilt
-    - add Backport-ocamlbuild-where-fix patch (from upstream)
 
- -- Stephane Glondu <steph at glondu.net>  Tue, 26 May 2009 18:55:07 +0200
+ -- Stephane Glondu <steph at glondu.net>  Wed, 03 Jun 2009 13:16:25 +0200
 
 ocaml (3.11.0-5) unstable; urgency=low
 
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 ef231d0..0ab6e42 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 e736a92..9028530 100755
+index 166ceaf..0327f64 100755
 --- a/configure
 +++ b/configure
 @@ -282,7 +282,8 @@ case "$bytecc,$host" in
@@ -31,5 +31,3 @@ index e736a92..9028530 100755
    amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";;
    amd64,gcc*,solaris,*) partialld="ld -r -m elf_x86_64";;
 -- 
-1.6.2.4
-
diff --git a/debian/patches/0002-Call-ld-with-proper-flags.patch b/debian/patches/0002-Call-ld-with-proper-flags.patch
index 6635dbd..c88102f 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 9028530..156c72a 100755
+index 0327f64..1d0d767 100755
 --- a/configure
 +++ b/configure
-@@ -1560,7 +1560,7 @@ echo "DEBUGGER=$debugger" >> Makefile
+@@ -1566,7 +1566,7 @@ echo "DEBUGGER=$debugger" >> Makefile
  echo "CC_PROFILE=$cc_profile" >> Makefile
  echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile
  echo "PARTIALLD=$partialld" >> Makefile
@@ -23,5 +23,3 @@ index 9028530..156c72a 100755
  echo "IFLEXDIR=$iflexdir" >> Makefile
  echo "O=o" >> Makefile
 -- 
-1.6.2.4
-
diff --git a/debian/patches/0003-Don-t-use-rpath.patch b/debian/patches/0003-Don-t-use-rpath.patch
index f6611e6..11bfba4 100644
--- a/debian/patches/0003-Don-t-use-rpath.patch
+++ b/debian/patches/0003-Don-t-use-rpath.patch
@@ -23,5 +23,3 @@ index cec4877..4db288f 100644
    String.length s >= String.length pref &&
    String.sub s 0 (String.length pref) = pref
 -- 
-1.6.2.4
-
diff --git a/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch
index 7b99188..19aaa0d 100644
--- a/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch
+++ b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch
@@ -20,5 +20,3 @@ index 66f9fdd..45476ec 100644
  
  autotest_stdlib: dummy
 -- 
-1.6.2.4
-
diff --git a/debian/patches/0005-Add-to-ocamldoc-support-for-native-code-dynamic-load.patch b/debian/patches/0005-Add-to-ocamldoc-support-for-native-code-dynamic-load.patch
deleted file mode 100644
index 9403dd4..0000000
--- a/debian/patches/0005-Add-to-ocamldoc-support-for-native-code-dynamic-load.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Stefano Zacchiroli <zack at debian.org>
-Date: Tue, 19 May 2009 17:25:59 +0200
-Subject: [PATCH] Add to ocamldoc support for native code dynamic loading
-
-That enables using ocamldoc flags such as "-g" also with
-ocamldoc.opt. Patch is taken from OCaml CVS and is already
-integrated upstream for future releases.
----
- man/ocamldoc.m |    5 +----
- 1 files changed, 1 insertions(+), 4 deletions(-)
-
-diff --git a/man/ocamldoc.m b/man/ocamldoc.m
-index 5d1ed6a..757ec58 100644
---- a/man/ocamldoc.m
-+++ b/man/ocamldoc.m
-@@ -110,10 +110,7 @@ to display it.
- .TP
- .BI \-g \ file
- Dynamically load the given file (which extension usually is .cmo or .cma),
--which defines a custom documentation generator. This option is supported by the
--.BR ocamldoc (1)
--command, but not by its native-code version
--.BR ocamldoc.opt .
-+which defines a custom documentation generator.
- If the given file is a simple one and does not exist in
- the current directory, then ocamldoc looks for it in the custom
- generators default directory, and in the directories specified with the
--- 
-1.6.2.4
-
diff --git a/debian/patches/0006-Patch-config.sh-for-installation.patch b/debian/patches/0005-Patch-config.sh-for-installation.patch
similarity index 99%
rename from debian/patches/0006-Patch-config.sh-for-installation.patch
rename to debian/patches/0005-Patch-config.sh-for-installation.patch
index db2e87e..75c0e51 100644
--- a/debian/patches/0006-Patch-config.sh-for-installation.patch
+++ b/debian/patches/0005-Patch-config.sh-for-installation.patch
@@ -35,5 +35,3 @@ index 7240fff..ea55334 100755
  not_installed=$PWD/_build/not_installed
  
 -- 
-1.6.2.4
-
diff --git a/debian/patches/0007-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch b/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch
similarity index 99%
rename from debian/patches/0007-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch
rename to debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch
index 0fc5ce1..e20fa97 100644
--- a/debian/patches/0007-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch
+++ b/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch
@@ -42,5 +42,3 @@ index ea55334..a0a0028 100755
  installlibdir \
    ocamlbuildlib.$A \
 -- 
-1.6.2.4
-
diff --git a/debian/patches/0008-Backport-ocamlbuild-where-fix.patch b/debian/patches/0008-Backport-ocamlbuild-where-fix.patch
deleted file mode 100644
index 00b4177..0000000
--- a/debian/patches/0008-Backport-ocamlbuild-where-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Tue, 26 May 2009 18:54:22 +0200
-Subject: [PATCH] Backport ocamlbuild -where fix
-
----
- ocamlbuild/ocamlbuild_where.ml |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/ocamlbuild/ocamlbuild_where.ml b/ocamlbuild/ocamlbuild_where.ml
-index 1703a53..14fcde5 100644
---- a/ocamlbuild/ocamlbuild_where.ml
-+++ b/ocamlbuild/ocamlbuild_where.ml
-@@ -1,5 +1,7 @@
- let bindir = ref Ocamlbuild_Myocamlbuild_config.bindir;;
- let libdir = ref begin
--  try Filename.concat (Sys.getenv "OCAMLLIB") "ocamlbuild"
--  with Not_found -> Ocamlbuild_Myocamlbuild_config.libdir
-+  Filename.concat
-+    (try Sys.getenv "OCAMLLIB"
-+     with Not_found -> Ocamlbuild_Myocamlbuild_config.libdir)
-+    "ocamlbuild"
- end;;
--- 
-1.6.2.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 96d00d6..e66568a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,5 @@
 0002-Call-ld-with-proper-flags.patch
 0003-Don-t-use-rpath.patch
 0004-Put-manpages-in-section-3o-instead-of-3.patch
-0005-Add-to-ocamldoc-support-for-native-code-dynamic-load.patch
-0006-Patch-config.sh-for-installation.patch
-0007-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch
-0008-Backport-ocamlbuild-where-fix.patch
+0005-Patch-config.sh-for-installation.patch
+0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch

-- 
OCaml packaging

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