[Pkg-ocaml-maint-commits] r3680 - in /trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian: changelog ocaml-mode.dirs patches/00list patches/install_scripts_config.dpatch patches/ocaml-interp_manpage.dpatch rules

treinen at users.alioth.debian.org treinen at users.alioth.debian.org
Wed Apr 11 15:57:42 UTC 2007 

Author: treinen
Date: Wed Apr 11 15:57:41 2007
New Revision: 3680

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3680
Log:
towards compiling ocaml 3.10.0

Added:
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/install_scripts_config.dpatch   (with props)
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/ocaml-interp_manpage.dpatch   (with props)
Modified:
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/changelog
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-mode.dirs
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/00list
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/rules

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=3680&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 15:57:41 2007
@@ -18,8 +18,19 @@
   * Policy
     - mandate the compilation of *.cm[ao] with debugging information for
       libraries and forbid it for bytecode programs
-
- -- Stefano Zacchiroli <zack at debian.org>  Wed, 11 Apr 2007 11:13:11 +0200
+  
+  [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
+
+ -- Ralf Treinen <treinen at debian.org>  Wed, 11 Apr 2007 16:37:21 +0200
 
 ocaml (3.09.3-1) experimental; urgency=low
 

Modified: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-mode.dirs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0%7Ebeta/debian/ocaml-mode.dirs?rev=3680&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-mode.dirs (original)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-mode.dirs Wed Apr 11 15:57:41 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/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=3680&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 15:57:41 2007
@@ -8,3 +8,7 @@
 #pr_o
 no_rpath
 stdlib_man_section
+install_scripts_config
+ocaml-interp_manpage
+
+

Added: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/install_scripts_config.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0%7Ebeta/debian/patches/install_scripts_config.dpatch?rev=3680&op=file
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/install_scripts_config.dpatch (added)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/install_scripts_config.dpatch Wed Apr 11 15:57:41 2007
@@ -1,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## install_scripts_config.dpatch by Ralf Treinen <treinen at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use for installatation a patched config.sh (created by debian/rules)
+## DP: Ralf Treinen <treinen at debian.org>
+
+ at DPATCH@
+diff -urNad ocaml-3.10.0~beta~/build/install.sh ocaml-3.10.0~beta/build/install.sh
+--- ocaml-3.10.0~beta~/build/install.sh	2007-03-06 10:48:38.000000000 +0100
++++ ocaml-3.10.0~beta/build/install.sh	2007-04-11 15:21:12.000000000 +0200
+@@ -3,7 +3,7 @@
+ 
+ cd `dirname $0`/..
+ 
+-. config/config.sh
++. config/config.debian.install.sh
+ 
+ not_installed=$PWD/_build/not_installed
+ 
+diff -urNad ocaml-3.10.0~beta~/build/partial-install.sh ocaml-3.10.0~beta/build/partial-install.sh
+--- ocaml-3.10.0~beta~/build/partial-install.sh	2007-03-06 10:48:38.000000000 +0100
++++ ocaml-3.10.0~beta/build/partial-install.sh	2007-04-11 15:21:33.000000000 +0200
+@@ -8,7 +8,7 @@
+ 
+ cd `dirname $0`/..
+ 
+-. config/config.sh
++. config/config.debian.install.sh
+ 
+ not_installed=$PWD/_build/not_installed
+ 

Propchange: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/install_scripts_config.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/ocaml-interp_manpage.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0%7Ebeta/debian/patches/ocaml-interp_manpage.dpatch?rev=3680&op=file
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/ocaml-interp_manpage.dpatch (added)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/ocaml-interp_manpage.dpatch Wed Apr 11 15:57:41 2007
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ocaml-interp_manpage.dpatch by Ralf Treinen <treinen at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: typo in ocaml manpage. <treinen at debian.org>
+
+ at DPATCH@
+diff -urNad ocaml-3.10.0~beta~/man/ocaml.m ocaml-3.10.0~beta/man/ocaml.m
+--- ocaml-3.10.0~beta~/man/ocaml.m	2002-02-08 11:16:10.000000000 +0100
++++ ocaml-3.10.0~beta/man/ocaml.m	2007-04-11 17:51:50.000000000 +0200
+@@ -25,7 +25,7 @@
+ command is the toplevel system for Objective Caml,
+ that permits interactive use of the Objective Caml system through a
+ read-eval-print loop. In this mode, the system repeatedly reads Caml
+-phrases from the input, then typechecks, compile and evaluate
++phrases from the input, then typechecks, compiles and evaluates
+ them, then prints the inferred type and result value, if any. The
+ system prints a # (sharp) prompt before reading each phrase.
+ 

Propchange: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/ocaml-interp_manpage.dpatch
------------------------------------------------------------------------------
    svn:executable = *

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=3680&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 15:57:41 2007
@@ -70,6 +70,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)/sublibs%g" \
 		config/Makefile >config/Makefile.debian
 	mv config/Makefile.debian config/Makefile
 	if test -z "`grep "OTHERLIBRARIES.*labltk" config/Makefile`"; then\
@@ -173,6 +175,7 @@
 	dh_installdirs -a
 
 	# Let's install ocaml first.
+	sed -e 's|PREFIX=\"/.*\"|PREFIX=\"$(CURDIR)/debian/usr\"|' < config/config.sh > config/config.debian.install.sh
 	$(MAKE) install PREFIX=$(CURDIR)/debian/ocaml-nox/usr
 	install -m 644 debian/ocaml.xpm \
 		$(CURDIR)/debian/ocaml-interp/usr/share/pixmaps

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