[Pkg-ocaml-maint-commits] r3667 - in /trunk/packages/ocaml/branches/ocaml-3.10.0~beta: ./ debian/ debian/cdbs/ debian/patches/

zack at users.alioth.debian.org zack at users.alioth.debian.org
Wed Apr 11 09:26:43 UTC 2007 

Author: zack
Date: Wed Apr 11 09:26:43 2007
New Revision: 3667

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3667
Log:
added ocaml 3.10.0~beta branch (does not yet build succesfully)

Added:
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/
      - copied from r3664, trunk/packages/ocaml/trunk/
Modified:
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/cdbs/ocaml-vars.mk
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/changelog
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/copyright.in
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-compiler-libs.copyright
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/00list
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/alpha_ld_no-relax.dpatch
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/call_ld_with_proper_flags.dpatch
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/no_rpath.dpatch
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/rules

Modified: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/cdbs/ocaml-vars.mk
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0%7Ebeta/debian/cdbs/ocaml-vars.mk?rev=3667&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/cdbs/ocaml-vars.mk (original)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/cdbs/ocaml-vars.mk Wed Apr 11 09:26:43 2007
@@ -25,7 +25,7 @@
 ifndef _cdbs_class_ocaml_vars
 _cdbs_class_ocaml_vars = 1
 
-# current OCaml ABI version (ATM 3.09.2).
+# current OCaml ABI version (e.g. 3.09.2).
 # Used internally by ocaml.mk (substituted for @OCamlABI@ in $(OCAML_IN_FILES)
 # below), may be useful to debian/rules writers as well
 OCAML_ABI := $(shell /usr/bin/ocamlc -version)

Modified: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0%7Ebeta/debian/changelog?rev=3667&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/changelog (original)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/changelog Wed Apr 11 09:26:43 2007
@@ -1,9 +1,14 @@
-ocaml (3.09.3-2) UNRELEASED; urgency=low
+ocaml (3.10.0~beta-1) UNRELEASED; urgency=low
 
   [ Samuel Mimram ]
   * Ship dh_ocaml into ocaml-nox
 
   [ Stefano Zacchiroli ]
+  * New upstream beta release (3.10.0).
+  * debian/patches/*
+    - removed: versioned_libdir (no longer needed with this upstream)
+    - ported to this upstream: call_ld_with_proper_flags, alpha_ld_no-relax,
+      no_rpath
   * CDBS class
     - added support for the OCAML_DLL_DIR variable, pointing ATM to the
       stublibs/ subdirectory of the standard library directory. It's
@@ -14,7 +19,7 @@
     - mandate the compilation of *.cm[ao] with debugging information for
       libraries and forbid it for bytecode programs
 
- -- Stefano Zacchiroli <zack at debian.org>  Mon, 09 Apr 2007 19:46:36 +0200
+ -- Stefano Zacchiroli <zack at debian.org>  Wed, 11 Apr 2007 11:13:11 +0200
 
 ocaml (3.09.3-1) experimental; urgency=low
 

Modified: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/copyright.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0%7Ebeta/debian/copyright.in?rev=3667&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/copyright.in (original)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/copyright.in Wed Apr 11 09:26:43 2007
@@ -2,7 +2,8 @@
 Fri, 14 Dec 2001 12:44:03 +0100.
 
 It was downloaded from:
-http://caml.inria.fr/pub/distrib/ocaml-3.09/ocaml-3.09.2.tar.gz
+
+  http://caml.inria.fr/pub/distrib/ocaml-3.10/
 
 Upstream Authors: Xavier Leroy, Jerome Vouillon and Damien Doligez
 Upstream Author for the camlp4 part: Daniel de Rauglaudre

Modified: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-compiler-libs.copyright
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0%7Ebeta/debian/ocaml-compiler-libs.copyright?rev=3667&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-compiler-libs.copyright (original)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-compiler-libs.copyright Wed Apr 11 09:26:43 2007
@@ -1,9 +1,9 @@
 This package was debianized by Sven Luther <luther at debian.org> on
 Fri, 14 Dec 2001 12:44:03 +0100.
 
-It was downloaded from
+It was downloaded from:
 
-  http://caml.inria.fr/pub/distrib/ocaml-3.09/ocaml-3.09.2.tar.gz
+  http://caml.inria.fr/pub/distrib/ocaml-3.10/
 
 Upstream Authors: Xavier Leroy, Jerome Vouillon and Damien Doligez
 Upstream Author for the camlp4 part: Daniel de Rauglaudre

Modified: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0%7Ebeta/debian/patches/00list?rev=3667&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/00list (original)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/00list Wed Apr 11 09:26:43 2007
@@ -1,4 +1,4 @@
-versioned_libdir
+#versioned_libdir
 objinfo
 dumpobj
 man-ocamlmklib

Modified: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/alpha_ld_no-relax.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0%7Ebeta/debian/patches/alpha_ld_no-relax.dpatch?rev=3667&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/alpha_ld_no-relax.dpatch (original)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/alpha_ld_no-relax.dpatch Wed Apr 11 09:26:43 2007
@@ -1,15 +1,16 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## alpha_ld_no-relax.dpatch by Steve Langasek <vorlon at debian.org>
+## alpha_ld_no-relax.dpatch by Stefano Zacchiroli <zack at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Pass the --no-relax option to ld to fix a segfault in initialization 
+## DP: Pass the --no-relax option to ld to fix a segfault in initialization
 ## DP: code (bug#338437)
 
+
 @DPATCH@
-diff -urNad ocaml-3.09.1+3.09.2rc1~/configure ocaml-3.09.1+3.09.2rc1/configure
---- ocaml-3.09.1+3.09.2rc1~/configure	2006-03-30 17:39:44.000000000 +0200
-+++ ocaml-3.09.1+3.09.2rc1/configure	2006-03-30 17:39:49.000000000 +0200
-@@ -268,7 +268,8 @@
+diff -urNad trunk~/configure trunk/configure
+--- trunk~/configure	2007-03-06 16:02:09.000000000 +0000
++++ trunk/configure	2007-04-10 17:08:18.000000000 +0000
+@@ -271,7 +271,8 @@
    gcc,alpha*-*-linux*)
      if cc="$bytecc" sh ./hasgot -mieee; then
        bytecccompopts="-mieee $bytecccompopts";
@@ -19,10 +20,10 @@
    cc,mips-*-irix6*)
      # Add -n32 flag to ensure compatibility with native-code compiler
      bytecccompopts="-n32"
-@@ -623,6 +624,7 @@
+@@ -630,6 +631,7 @@
                         nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";;
-   *,*,rhapsody,*)
-                  nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs";;
+   *,*,rhapsody,*)      nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs"
+                        if $arch64; then partialld="ld -r -arch ppc64"; fi;;
 +  alpha,gcc*,linux*,*) nativecclinkopts="-Wl,--no-relax";;
    *,gcc*,cygwin,*)     nativecccompopts="$gcc_warnings -U_WIN32";;
    *,gcc*,*,*)          nativecccompopts="$gcc_warnings";;

Modified: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/call_ld_with_proper_flags.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0%7Ebeta/debian/patches/call_ld_with_proper_flags.dpatch?rev=3667&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/call_ld_with_proper_flags.dpatch (original)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/call_ld_with_proper_flags.dpatch Wed Apr 11 09:26:43 2007
@@ -1,5 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## call_ld_with_proper_flags.dpatch by Julien Cristau <julien.cristau at ens-lyon.org>
+## call_ld_with_proper_flags.dpatch by Stefano Zacchiroli <zack at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Filter linkflags passed to ld by ocamlopt -pack and -output-obj
@@ -7,10 +7,10 @@
 ## DP: gcc.
 
 @DPATCH@
-diff -urNad ocaml-3.09.1+3.09.2rc1~/Makefile ocaml-3.09.1+3.09.2rc1/Makefile
---- ocaml-3.09.1+3.09.2rc1~/Makefile	2006-03-30 17:40:58.000000000 +0200
-+++ ocaml-3.09.1+3.09.2rc1/Makefile	2006-03-30 17:41:00.000000000 +0200
-@@ -313,6 +313,7 @@
+diff -urNad trunk~/Makefile trunk/Makefile
+--- trunk~/Makefile	2007-03-05 10:18:22.000000000 +0100
++++ trunk/Makefile	2007-04-11 10:51:08.000000000 +0200
+@@ -314,6 +314,7 @@
  partialclean::
  	rm -f ocaml toplevel/toplevellib.cma
  
@@ -18,14 +18,14 @@
  # The configuration file
  
  utils/config.ml: utils/config.mlp config/Makefile
-@@ -324,8 +325,8 @@
+@@ -325,8 +326,8 @@
              -e 's|%%BYTELINK%%|$(BYTECC) $(BYTECCLINKOPTS)|' \
              -e 's|%%NATIVECC%%|$(NATIVECC) $(NATIVECCCOMPOPTS)|' \
              -e 's|%%NATIVELINK%%|$(NATIVECC) $(NATIVECCLINKOPTS)|' \
--            -e 's|%%PARTIALLD%%|ld -r $(NATIVECCLINKOPTS)|' \
--            -e 's|%%PACKLD%%|ld -r $(NATIVECCLINKOPTS)|' \
-+            -e 's|%%PARTIALLD%%|ld -r $(subst $(Wl),,$(NATIVECCLINKOPTS))|' \
-+            -e 's|%%PACKLD%%|ld -r $(subst $(Wl),,$(NATIVECCLINKOPTS))|' \
+-            -e 's|%%PARTIALLD%%|$(PARTIALLD) $(NATIVECCLINKOPTS)|' \
+-            -e 's|%%PACKLD%%|$(PARTIALLD) $(NATIVECCLINKOPTS) -o |' \
++            -e 's|%%PARTIALLD%%|$(PARTIALLD) $(subst $(Wl),,$(NATIVECCLINKOPTS))|' \
++            -e 's|%%PACKLD%%|$(PARTIALLD) $(subst $(Wl),,$(NATIVECCLINKOPTS)) -o |' \
              -e 's|%%BYTECCLIBS%%|$(BYTECCLIBS)|' \
              -e 's|%%NATIVECCLIBS%%|$(NATIVECCLIBS)|' \
              -e 's|%%RANLIBCMD%%|$(RANLIBCMD)|' \

Modified: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/no_rpath.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0%7Ebeta/debian/patches/no_rpath.dpatch?rev=3667&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/no_rpath.dpatch (original)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/no_rpath.dpatch Wed Apr 11 09:26:43 2007
@@ -1,37 +1,22 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## no_rpath.dpatch by Red Hat people
+## no_rpath.dpatch by Stefano Zacchiroli <zack at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't use rpath. This was shamelessly taken from
-## DP: http://cvs.fedora.redhat.com/lxr/extras/source/devel/ocaml/ocaml-rpath.patch
+## DP: Don't use rpath.
 
 @DPATCH@
-diff -urNad ocaml-3.09.2~/tools/Makefile ocaml-3.09.2/tools/Makefile
---- ocaml-3.09.2~/tools/Makefile	2006-05-04 00:05:39.000000000 +0200
-+++ ocaml-3.09.2/tools/Makefile	2006-05-04 00:05:40.000000000 +0200
-@@ -104,9 +104,6 @@
- 	sed -e "s|%%BINDIR%%|$(BINDIR)|" \
-             -e "s|%%SUPPORTS_SHARED_LIBRARIES%%|$(SUPPORTS_SHARED_LIBRARIES)|" \
-             -e "s|%%MKSHAREDLIB%%|$(MKSHAREDLIB)|" \
--            -e "s|%%BYTECCRPATH%%|$(BYTECCRPATH)|" \
--            -e "s|%%NATIVECCRPATH%%|$(NATIVECCRPATH)|" \
--            -e "s|%%MKSHAREDLIBRPATH%%|$(MKSHAREDLIBRPATH)|" \
-             -e "s|%%RANLIB%%|$(RANLIB)|" \
-           ocamlmklib.mlp >> ocamlmklib.ml
+diff -urNad trunk~/tools/ocamlmklib.mlp trunk/tools/ocamlmklib.mlp
+--- trunk~/tools/ocamlmklib.mlp	2007-02-07 11:31:36.000000000 +0100
++++ trunk/tools/ocamlmklib.mlp	2007-04-11 11:10:26.000000000 +0200
+@@ -33,6 +33,11 @@
+ and implib = ref ""         (* windows implib flag *)
+ and verbose = ref false
  
-diff -urNad ocaml-3.09.2~/tools/ocamlmklib.mlp ocaml-3.09.2/tools/ocamlmklib.mlp
---- ocaml-3.09.2~/tools/ocamlmklib.mlp	2006-05-04 00:01:58.000000000 +0200
-+++ ocaml-3.09.2/tools/ocamlmklib.mlp	2006-05-04 00:05:40.000000000 +0200
-@@ -17,9 +17,9 @@
- let bindir = "%%BINDIR%%"
- and supports_shared_libraries = %%SUPPORTS_SHARED_LIBRARIES%%
- and mksharedlib = "%%MKSHAREDLIB%%"
--and bytecc_rpath = "%%BYTECCRPATH%%"
--and nativecc_rpath = "%%NATIVECCRPATH%%"
--and mksharedlib_rpath = "%%MKSHAREDLIBRPATH%%"
-+and bytecc_rpath = ""
-+and nativecc_rpath = ""
-+and mksharedlib_rpath = ""
- and ranlib = "%%RANLIB%%"
- 
- let bytecode_objs = ref []  (* .cmo,.cma,.ml,.mli files to pass to ocamlc *)
++(* Debian specific: inhibit rpath *)
++let byteccrpath = ""
++and nativeccrpath = ""
++and mksharedlibrpath = ""
++
+ let starts_with s pref =
+   String.length s >= String.length pref &&
+   String.sub s 0 (String.length pref) = pref

Modified: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0%7Ebeta/debian/rules?rev=3667&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/rules (original)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/rules Wed Apr 11 09:26:43 2007
@@ -8,8 +8,8 @@
 # We want to use dpatch.
 include /usr/share/dpatch/dpatch.make
 PACKAGE = ocaml
-OCAMLMAJOR = 3.09
-OCAMLMINOR = 3
+OCAMLMAJOR = 3.10
+OCAMLMINOR = 0
 OCAMLABI = $(OCAMLMAJOR).$(OCAMLMINOR)
 STDLIBDIR = /usr/lib/ocaml/$(OCAMLABI)
 MD5SUMSDIR = /var/lib/ocaml/md5sums

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