[Pkg-ocaml-maint-commits] r3830 - in /trunk/packages/ocaml: branches/ocaml-3.10.0/ trunk/debian/ trunk/debian/cdbs/ trunk/debian/patches/ upstream/
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Thu Jun 14 19:42:34 UTC 2007
Author: zack
Date: Thu Jun 14 19:42:34 2007
New Revision: 3830
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3830
Log:
merged 3.10.0 branch with trunk/
Added:
trunk/packages/ocaml/trunk/debian/TODO.Debian
- copied, changed from r3829, trunk/packages/ocaml/branches/ocaml-3.10.0/debian/TODO.Debian
trunk/packages/ocaml/trunk/debian/ocaml-base-nox.install.in
- copied unchanged from r3829, trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml-base-nox.install.in
trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.install.in
- copied unchanged from r3829, trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml-compiler-libs.install.in
trunk/packages/ocaml/trunk/debian/ocaml-interp.install.in
- copied unchanged from r3829, trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml-interp.install.in
trunk/packages/ocaml/trunk/debian/ocaml-nox.install.in
- copied unchanged from r3829, trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml-nox.install.in
trunk/packages/ocaml/trunk/debian/ocaml-source.dirs.in
- copied unchanged from r3829, trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml-source.dirs.in
trunk/packages/ocaml/trunk/debian/ocaml-source.exclude
- copied unchanged from r3829, trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml-source.exclude
trunk/packages/ocaml/trunk/debian/ocaml-source.install.in
- copied unchanged from r3829, trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml-source.install.in
trunk/packages/ocaml/trunk/debian/ocaml.install.in
- copied unchanged from r3829, trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml.install.in
trunk/packages/ocaml/trunk/debian/patches/install_ocamlbuild.dpatch
- copied unchanged from r3829, trunk/packages/ocaml/branches/ocaml-3.10.0/debian/patches/install_ocamlbuild.dpatch
trunk/packages/ocaml/trunk/debian/patches/install_scripts_config.dpatch
- copied unchanged from r3829, trunk/packages/ocaml/branches/ocaml-3.10.0/debian/patches/install_scripts_config.dpatch
Removed:
trunk/packages/ocaml/branches/ocaml-3.10.0/
trunk/packages/ocaml/trunk/debian/ocaml-nox.install
trunk/packages/ocaml/trunk/debian/ocaml-source.dirs
trunk/packages/ocaml/trunk/debian/ocaml-source.files
trunk/packages/ocaml/trunk/debian/patches/pr_o.dpatch
trunk/packages/ocaml/trunk/debian/patches/versioned_libdir.dpatch.in
trunk/packages/ocaml/upstream/ocaml_3.09.2.orig.tar.gz
Modified:
trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk
trunk/packages/ocaml/trunk/debian/changelog
trunk/packages/ocaml/trunk/debian/control.in
trunk/packages/ocaml/trunk/debian/copyright.in
trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.copyright
trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.dirs.in
trunk/packages/ocaml/trunk/debian/ocaml-mode.dirs
trunk/packages/ocaml/trunk/debian/ocaml-native-compilers.files
trunk/packages/ocaml/trunk/debian/ocaml.docs
trunk/packages/ocaml/trunk/debian/ocaml.files.in
trunk/packages/ocaml/trunk/debian/patches/00dpatch.conf
trunk/packages/ocaml/trunk/debian/patches/00list
trunk/packages/ocaml/trunk/debian/patches/alpha_ld_no-relax.dpatch
trunk/packages/ocaml/trunk/debian/patches/call_ld_with_proper_flags.dpatch
trunk/packages/ocaml/trunk/debian/patches/no_rpath.dpatch
trunk/packages/ocaml/trunk/debian/rules
Copied: trunk/packages/ocaml/trunk/debian/TODO.Debian (from r3829, trunk/packages/ocaml/branches/ocaml-3.10.0/debian/TODO.Debian)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/TODO.Debian?rev=3830&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0/debian/TODO.Debian (original)
+++ trunk/packages/ocaml/trunk/debian/TODO.Debian Thu Jun 14 19:42:34 2007
@@ -1,5 +1,4 @@
TODO list for ocaml 3.10.0 (and beyond ...)
-- merge with trunk/
- lintian warnings
lintian /home/srv/debian/pkg-ocaml-maint/packages/ocaml/build-area/ocaml_3.10.0-1_i386.changes
W: ocaml source: substvar-source-version-is-deprecated ocaml-nox
Modified: trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk?rev=3830&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk (original)
+++ trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk Thu Jun 14 19:42:34 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/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/changelog?rev=3830&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/changelog (original)
+++ trunk/packages/ocaml/trunk/debian/changelog Thu Jun 14 19:42:34 2007
@@ -1,9 +1,44 @@
-ocaml (3.09.3-2) UNRELEASED; urgency=low
+ocaml (3.10.0-2) UNRELEASED; urgency=low
+
+ * Policy
+ - update the Vcs-Svn info to the latest PTS documentation
+ - describe dependencies from a -dev package to its companion shared stub
+ package (if any) and suggest the usage of ${binary:Version}
+
+ -- Stefano Zacchiroli <zack at debian.org> Thu, 14 Jun 2007 20:40:44 +0100
+
+ocaml (3.10.0-1) experimental; urgency=low
+
+ [ Stefano Zacchiroli ]
+ * New upstream (stable) release
+ * debian/patches/*
+ - removed: ocaml-interp_manpage, build_wo_debug_info (integrated upstream)
+ - updated: install_ocamlbuild
+ * ship ocaml-compiler-libs objects as STDLIB/ocaml-compiler-libs/{parsing/,
+ typing/, utils/} rather than as a flat dir tree
+ * re-enabled ocaml-source package (which ships
+ /usr/src/ocaml-3.10.0.tar.bz2), now with a better way to generate it:
+ everything in the build dir except debian/ will be copied in the resulting
+ tarball
+ * debian/ocaml-source.exclude
+ - new file: list of tar exclude patterns, matching file won't be shipped
+ in the ocaml source tarball
+
+ -- Stefano Zacchiroli <zack at debian.org> Wed, 13 Jun 2007 17:19:10 +0200
+
+ocaml (3.10.0~beta-1) experimental; 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
+ - added: build_wo_debug_info.dpatch (avoid building camlp4/ocamldoc with
+ debug info, wont be needed for the stable release)
* CDBS class
- added support for the OCAML_DLL_DIR variable, pointing ATM to the
stublibs/ subdirectory of the standard library directory. It's
@@ -13,11 +48,23 @@
* Policy
- mandate the compilation of *.cm[ao] with debugging information for
libraries and forbid it for bytecode programs
- - update the Vcs-Svn info to the latest PTS documentation
- - describe dependencies from a -dev package to its companion shared stub
- package (if any) and suggest the usage of ${binary:Version}
-
- -- Stefano Zacchiroli <zack at debian.org> Wed, 16 May 2007 13:22:23 +0200
+ * debian/rules
+ - delegated more installation stuff to dh_install
+ * debian/control
+ - get rid of the no longer needed ocaml-source package
+
+ [Ralf Treinen]
+ * debian/patches/*
+ - added: install_scripts_config: use a patched config.sh since PREFIX is
+ diferent at compile time and at installation time
+ - added: ocaml-interp_manpage, fixes typo in ocaml manpage
+ (closes: Bug#417847).
+ * debian/rules:
+ - added creation of config/config.debian.install
+ - Patch LIBDIR and STBLIBDIR setting in config/Makefile after invokation
+ of configure
+
+ -- Stefano Zacchiroli <zack at debian.org> Tue, 17 Apr 2007 09:57:47 +0200
ocaml (3.09.3-1) experimental; urgency=low
Modified: trunk/packages/ocaml/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/control.in?rev=3830&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/control.in (original)
+++ trunk/packages/ocaml/trunk/debian/control.in Thu Jun 14 19:42:34 2007
@@ -94,7 +94,7 @@
This package contains only the runtime system needed to run bytecode
executables. The `ocaml' package contains the full development suite of
Objective Caml. You may wish to install the 'ocaml-base-nox' package if
- you do not require any graphical capilities for your runtime.
+ you do not require any graphical capabilities for your runtime.
Package: ocaml-native-compilers
Architecture: #OcamlNativeArchs#
Modified: trunk/packages/ocaml/trunk/debian/copyright.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/copyright.in?rev=3830&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/copyright.in (original)
+++ trunk/packages/ocaml/trunk/debian/copyright.in Thu Jun 14 19:42:34 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/trunk/debian/ocaml-compiler-libs.copyright
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.copyright?rev=3830&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.copyright (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.copyright Thu Jun 14 19:42:34 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/trunk/debian/ocaml-compiler-libs.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.dirs.in?rev=3830&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.dirs.in (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.dirs.in Thu Jun 14 19:42:34 2007
@@ -1,2 +1,4 @@
-usr/lib/ocaml/#OcamlABI#/compiler-libs
+usr/lib/ocaml/#OcamlABI#/compiler-libs/parsing
+usr/lib/ocaml/#OcamlABI#/compiler-libs/typing
+usr/lib/ocaml/#OcamlABI#/compiler-libs/utils
usr/share/lintian/overrides
Modified: trunk/packages/ocaml/trunk/debian/ocaml-mode.dirs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml-mode.dirs?rev=3830&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-mode.dirs (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml-mode.dirs Thu Jun 14 19:42:34 2007
@@ -1,2 +1,2 @@
usr/bin
-usr/share/emacs/site-lisp/ocaml-mode
+usr/share/emacs/site-lisp/ocaml-mode
Modified: trunk/packages/ocaml/trunk/debian/ocaml-native-compilers.files
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml-native-compilers.files?rev=3830&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-native-compilers.files (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml-native-compilers.files Thu Jun 14 19:42:34 2007
@@ -1,7 +1,1 @@
-/usr/bin/ocamlc.opt
-/usr/bin/ocamlopt.opt
-/usr/bin/ocamllex.opt
-/usr/bin/camlp4o.opt
-/usr/bin/camlp4r.opt
-/usr/bin/ocamldoc.opt
-/usr/bin/ocamldep.opt
+/usr/bin/*.opt
Modified: trunk/packages/ocaml/trunk/debian/ocaml.docs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml.docs?rev=3830&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml.docs (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml.docs Thu Jun 14 19:42:34 2007
@@ -1,2 +1,1 @@
-debian/README.labltk
otherlibs/labltk/examples_labltk
Modified: trunk/packages/ocaml/trunk/debian/ocaml.files.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml.files.in?rev=3830&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml.files.in (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml.files.in Thu Jun 14 19:42:34 2007
@@ -1,4 +1,5 @@
usr/bin/labltk
+usr/bin/ocamlbrowser
usr/lib/ocaml/#OcamlABI#/graphics.cma
usr/lib/ocaml/#OcamlABI#/graphics.cmi
usr/lib/ocaml/#OcamlABI#/graphicsX11.cmi
Modified: trunk/packages/ocaml/trunk/debian/patches/00dpatch.conf
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/patches/00dpatch.conf?rev=3830&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/patches/00dpatch.conf (original)
+++ trunk/packages/ocaml/trunk/debian/patches/00dpatch.conf Thu Jun 14 19:42:34 2007
@@ -1,2 +1,2 @@
conf_debianonly=1
-conf_origtargzpath=../upstream
+conf_origtargzpath=../../upstream
Modified: trunk/packages/ocaml/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/patches/00list?rev=3830&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/patches/00list (original)
+++ trunk/packages/ocaml/trunk/debian/patches/00list Thu Jun 14 19:42:34 2007
@@ -1,10 +1,10 @@
-versioned_libdir
-objinfo
-dumpobj
-man-ocamlmklib
-#kbsd-gnu
-alpha_ld_no-relax
-call_ld_with_proper_flags
-#pr_o
-no_rpath
-stdlib_man_section
+objinfo.dpatch
+dumpobj.dpatch
+man-ocamlmklib.dpatch
+#kbsd-gnu.dpatch
+alpha_ld_no-relax.dpatch
+call_ld_with_proper_flags.dpatch
+no_rpath.dpatch
+stdlib_man_section.dpatch
+install_scripts_config.dpatch
+#install_ocamlbuild.dpatch
Modified: trunk/packages/ocaml/trunk/debian/patches/alpha_ld_no-relax.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/patches/alpha_ld_no-relax.dpatch?rev=3830&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/patches/alpha_ld_no-relax.dpatch (original)
+++ trunk/packages/ocaml/trunk/debian/patches/alpha_ld_no-relax.dpatch Thu Jun 14 19:42:34 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/trunk/debian/patches/call_ld_with_proper_flags.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/patches/call_ld_with_proper_flags.dpatch?rev=3830&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/patches/call_ld_with_proper_flags.dpatch (original)
+++ trunk/packages/ocaml/trunk/debian/patches/call_ld_with_proper_flags.dpatch Thu Jun 14 19:42:34 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/trunk/debian/patches/no_rpath.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/patches/no_rpath.dpatch?rev=3830&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/patches/no_rpath.dpatch (original)
+++ trunk/packages/ocaml/trunk/debian/patches/no_rpath.dpatch Thu Jun 14 19:42:34 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/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/rules?rev=3830&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/rules (original)
+++ trunk/packages/ocaml/trunk/debian/rules Thu Jun 14 19:42:34 2007
@@ -1,20 +1,16 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets by Bill Allombert 2001
-
-# 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
+INSTDIR = $(CURDIR)/debian/ocaml-nox/usr
NATIVE_ARCHS = $(shell cat debian/native-archs)
+DISTDIR = $(PACKAGE)-$(OCAMLMAJOR).$(OCAMLMINOR)
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -56,13 +52,15 @@
debian/control:
sed -e 's/#OcamlNativeArchs#/$(NATIVE_ARCHS)/g' debian/control.in > $@
-# Generate list of files ocaml-source.
-# Should never be called automatically.
-debian/ocaml-source.files:
- tar ztf ../upstream/ocaml_$(OCAMLABI).orig.tar.gz | cut -d/ -f2- | grep -v ^$$ | grep -v .*/$$ | grep -v .cvsignore > debian/ocaml-source.files
-
-
-config-stamp: configure abi-sed
+pre-config: debian/$(DISTDIR).tar.bz2
+debian/$(DISTDIR).tar.bz2:
+ ln -fs . $(DISTDIR) # beware of the symlink recursion!
+ tar --anchored -chjf debian/$(DISTDIR).tar.bz2 \
+ --exclude=$(DISTDIR)/$(DISTDIR) \
+ --exclude-from=debian/ocaml-source.exclude \
+ $(DISTDIR)/
+
+config-stamp: configure pre-config patch-stamp abi-sed
dh_testdir
# Add here commands to configure the package.
./configure --with-pthread -prefix /usr \
@@ -70,6 +68,8 @@
-tkdefs "-I/usr/include/tcl8.4" \
-tklibs "-L/usr/lib -ltk8.4 -ltcl8.4"
sed -e "s%MANDIR=.*$$%MANDIR=\$$(PREFIX)/share/man%g" \
+ -e "s%LIBDIR=.*$$%LIBDIR=\$$(PREFIX)/lib/ocaml/$(OCAMLABI)%g" \
+ -e "s%STUBLIBDIR=.*$$%STUBLIBDIR=\$$(PREFIX)/lib/ocaml/$(OCAMLABI)/stublibs%g" \
config/Makefile >config/Makefile.debian
mv config/Makefile.debian config/Makefile
if test -z "`grep "OTHERLIBRARIES.*labltk" config/Makefile`"; then\
@@ -87,7 +87,7 @@
build: build-arch build-indep
build-arch: build-arch-stamp
-build-arch-stamp: patch-stamp config-stamp
+build-arch-stamp: config-stamp
# Add here commands to compile the arch part of the package.
if test ! -d boot.debian; then \
@@ -109,10 +109,9 @@
$(MAKE) -C debian/policy
touch build-arch-stamp
-build-indep: build-indep-stamp
-build-indep-stamp: patch-stamp config-stamp
- # Add here commands to compile the indep part of the package.
- #$(MAKE) doc
+build-indep: build-indep-stamp config-stamp
+build-indep-stamp:
+ # create ocaml source tarball
touch $@
clean: abi-sed unpatch
@@ -139,6 +138,7 @@
dh_clean debian/README.labltk camlp4/config/Makefile.cnf camlp4/config/Makefile config/m.h config/s.h config/Makefile emacs/ocamltags driver/ocamlcomp.sh
debian/rules abi-sed-clean
+ rm -f debian/$(DISTDIR).tar.bz2
install: install-indep install-arch
install-indep: build-indep
@@ -155,15 +155,6 @@
fi
$(MAKE) -C emacs SCRIPTDIR=$(CURDIR)/debian/ocaml-mode/usr/bin install-ocamltags
- # Build the archive for ocaml-source
- for i in `cat debian/ocaml-source.files`; do \
- install -m 644 -D $$i \
- debian/ocaml-source/usr/src/ocaml-$(OCAMLABI)/$$i; \
- done
- tar cjf debian/ocaml-source/usr/src/ocaml-source-$(OCAMLABI).tar.bz2 \
- -C debian/ocaml-source/usr/src ocaml-$(OCAMLABI)
- rm -rf debian/ocaml-source/usr/src/ocaml-$(OCAMLABI)
-
dh_install -i
install-arch: build-arch
@@ -173,20 +164,8 @@
dh_installdirs -a
# Let's install ocaml first.
- $(MAKE) install PREFIX=$(CURDIR)/debian/ocaml-nox/usr
- install -m 644 debian/ocaml.xpm \
- $(CURDIR)/debian/ocaml-interp/usr/share/pixmaps
- install -m 644 debian/ocaml-nox.override \
- $(CURDIR)/debian/ocaml-nox/usr/share/lintian/overrides/ocaml-nox
- install -m 644 debian/ocaml-compiler-libs.override \
- $(CURDIR)/debian/ocaml-compiler-libs/usr/share/lintian/overrides/ocaml-compiler-libs
- install -m 644 otherlibs/labltk/README \
- $(CURDIR)/debian/README.labltk
- install -m 644 config/Makefile \
- $(CURDIR)/debian/ocaml-nox/usr/lib/ocaml/$(OCAMLABI)/config/Makefile
-
- # Install the list of archs with ocamlopt
- install -m 644 debian/native-archs $(CURDIR)/debian/ocaml-nox$(STDLIBDIR)
+ sed -e 's|PREFIX=\"/.*\"|PREFIX=\"$(INSTDIR)"|' < config/config.sh > config/config.debian.install.sh
+ $(MAKE) install PREFIX=$(INSTDIR)
# Now move the graphics files over
if [ -e opt-built-stamp ]; then \
@@ -200,8 +179,6 @@
# Then move the ocaml-base-nox package.
dh_movefiles -pocaml-base-nox --sourcedir=debian/ocaml-nox
- install -m 644 debian/ld.conf \
- $(CURDIR)/debian/ocaml-base-nox/usr/lib/ocaml/$(OCAMLABI)
# And base's corresponding graphics stuff.
dh_movefiles -pocaml-base --sourcedir=debian/ocaml-nox
@@ -216,17 +193,6 @@
# The interpreter files
dh_movefiles -pocaml-interp --sourcedir=debian/ocaml-nox
-
- # Some extra stuff
- install -m 644 utils/*.mli utils/*.cmi utils/*.cmo \
- typing/*.mli typing/*.cmi typing/*.cmo \
- parsing/*.mli parsing/*.cmi parsing/*.cmo \
- $(CURDIR)/debian/ocaml-compiler-libs/usr/lib/ocaml/$(OCAMLABI)/compiler-libs
- if [ -e opt-built-stamp ]; then \
- install -m 644 utils/*.cmx utils/*.o typing/*.cmx \
- typing/*.o parsing/*.cmx parsing/*.o \
- $(CURDIR)/debian/ocaml-compiler-libs/usr/lib/ocaml/$(OCAMLABI)/compiler-libs; \
- fi
# Install ocaml-md5sums
$(MAKE) -C debian/ocaml-md5sums install DESTDIR=$(CURDIR)/debian/ocaml-base-nox/usr/bin
More information about the Pkg-ocaml-maint-commits
mailing list