[Pkg-ocaml-maint-commits] r1876 - trunk/packages/cduce/trunk/debian/patches

[Thomas Petazzoni]

Author: tpetazzo-guest
Date: 2005-10-31 21:41:37 +0000 (Mon, 31 Oct 2005)
New Revision: 1876

Added:
   trunk/packages/cduce/trunk/debian/patches/hoary-backport-src.dpatch
Modified:
   trunk/packages/cduce/trunk/debian/patches/ocamliface-relative-path-fix.dpatch
Log:
Add a hoary backport patch.

Added: trunk/packages/cduce/trunk/debian/patches/hoary-backport-src.dpatch
===================================================================
--- trunk/packages/cduce/trunk/debian/patches/hoary-backport-src.dpatch	2005-10-31 21:03:35 UTC (rev 1875)
+++ trunk/packages/cduce/trunk/debian/patches/hoary-backport-src.dpatch	2005-10-31 21:41:37 UTC (rev 1876)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## hoary-backport-src.dpatch by  <thomas at crazy.kos.nx>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/Makefile trunk/Makefile
+--- trunk~/Makefile	2005-10-31 11:55:09.000000000 +0100
++++ trunk/Makefile	2005-10-31 22:39:27.000000000 +0100
+@@ -48,7 +48,7 @@
+   CAMLOPT_P = ocamlopt -inline 10000
+ endif
+ 
+-OPT = -warn-error FPSXY
++OPT = -warn-error FPSX
+ ANNOT =
+ INTERFACE =
+ ifeq ($(ANNOT), true)


Property changes on: trunk/packages/cduce/trunk/debian/patches/hoary-backport-src.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/cduce/trunk/debian/patches/ocamliface-relative-path-fix.dpatch
===================================================================
--- trunk/packages/cduce/trunk/debian/patches/ocamliface-relative-path-fix.dpatch	2005-10-31 21:03:35 UTC (rev 1875)
+++ trunk/packages/cduce/trunk/debian/patches/ocamliface-relative-path-fix.dpatch	2005-10-31 21:41:37 UTC (rev 1876)
@@ -6,18 +6,32 @@
 
 @DPATCH@
 diff -urNad trunk~/ocamliface/Makefile trunk/ocamliface/Makefile
---- trunk~/ocamliface/Makefile	2005-10-31 11:55:08.000000000 +0100
-+++ trunk/ocamliface/Makefile	2005-10-31 22:02:02.000000000 +0100
-@@ -8,6 +8,7 @@
+--- trunk~/ocamliface/Makefile	2005-10-31 22:06:36.000000000 +0100
++++ trunk/ocamliface/Makefile	2005-10-31 22:06:55.000000000 +0100
+@@ -8,7 +8,6 @@
  STDLIB=$(shell ocamlc -where)
  CMI_MAGIC=$(shell grep cmi_magic ocaml-3.08.4/utils/config.mlp)
  
-+OCAML_SRC=../$(OCAML_SRC)
- 
+-
  ifeq ($(FORPACK),true)
    FORPACKOPT1=-for-pack Cduce_lib.Caml_cduce
-@@ -63,4 +64,4 @@
+   FORPACKOPT2=-for-pack Cduce_lib
+@@ -19,11 +18,11 @@
  
+ ocaml_files:
+ 	mkdir ocaml_files
+-	$(HIDE)cp $(patsubst %,$(OCAML_SRC)/%, $(COPY_FILES)) ocaml_files/
++	$(HIDE)cp $(patsubst %,../$(OCAML_SRC)/%, $(COPY_FILES)) ocaml_files/
+ 	cp location.ml ocaml_files
+ 	mv ocaml_files/asttypes.mli ocaml_files/asttypes.ml
+ 	sed s=STDLIB=$(STDLIB)= config.ml > ocaml_files/config.ml
+-	grep cmi_magic $(OCAML_SRC)/utils/config.mlp >> ocaml_files/config.ml
++	grep cmi_magic ../$(OCAML_SRC)/utils/config.mlp >> ocaml_files/config.ml
+ 
+ caml_cduce.cmo: ocaml_files
+ 	@echo "Build $@"
+@@ -63,4 +62,4 @@
+ 
  COMPILE_FILES_ML=$(filter %.ml,$(COMPILE_FILES))
  OBJECTS=$(COMPILE_FILES_ML:.ml=.cmo)
 -XOBJECTS=$(COMPILE_FILES_ML:.ml=.cmx)