The following commit has been merged in the master branch:
commit 76916ef5012f44f7b51fdaeaaf2cd549632f94ef
Author: Sylvain Le Gall <gil...@debian.org>
Date:   Mon Apr 18 15:48:00 2011 +0200

    Switch patches to dom-{apply,save}-patches scheme

diff --git a/OCamlMakefile b/OCamlMakefile
index c674c9f..731736e 100644
--- a/OCamlMakefile
+++ b/OCamlMakefile
@@ -904,7 +904,7 @@ endif
 
 ifndef LIB_PACK_NAME
 $(RESULT).cma:         $(REAL_IMPL_INTF) $(MAKEDLL) $(EXTRADEPS) $(RESULTDEPS)
-                       $(REAL_OCAMLFIND) $(REAL_OCAMLC) -a \
+                       $(REAL_OCAMLFIND) $(REAL_OCAMLC) -a $(ALL_LDFLAGS) \
                                $(OBJS_LIBS) -o $@ $(OCAMLBLDFLAGS) $(REAL_IMPL)
 
 $(RESULT).cmxa $(RESULT).$(EXT_LIB):   $(REAL_IMPL_INTF) $(EXTRADEPS) 
$(RESULTDEPS)
@@ -920,7 +920,7 @@ $(LIB_PACK_NAME).cmi $(LIB_PACK_NAME).cmx: $(REAL_IMPL_INTF)
 endif
 
 $(RESULT).cma:         $(LIB_PACK_NAME).cmi $(LIB_PACK_NAME).cmo $(MAKEDLL) 
$(EXTRADEPS) $(RESULTDEPS)
-                       $(REAL_OCAMLFIND) $(REAL_OCAMLC) -a \
+                       $(REAL_OCAMLFIND) $(REAL_OCAMLC) -a $(ALL_LDFLAGS) \
                                $(OBJS_LIBS) -o $@ $(OCAMLBLDFLAGS) 
$(LIB_PACK_NAME).cmo
 
 $(RESULT).cmxa $(RESULT).$(EXT_LIB):   $(LIB_PACK_NAME).cmi 
$(LIB_PACK_NAME).cmx $(EXTRADEPS) $(RESULTDEPS)
diff --git a/debian/patches/0001-Do-not-force-.opt-compilers.patch 
b/debian/patches/0001-Do-not-force-.opt-compilers.patch
new file mode 100644
index 0000000..3490c02
--- /dev/null
+++ b/debian/patches/0001-Do-not-force-.opt-compilers.patch
@@ -0,0 +1,39 @@
+From: Sylvain Le Gall <gil...@debian.org>
+Date: Mon, 18 Apr 2011 15:51:44 +0200
+Subject: Do not force *.opt compilers
+
+Signed-off-by: Sylvain Le Gall <gil...@debian.org>
+Signed-off-by: Stephane Glondu <st...@glondu.net>
+---
+ lib/Makefile    |    3 ---
+ syntax/Makefile |    3 ---
+ 2 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/lib/Makefile b/lib/Makefile
+index b1fd7eb..7ad6241 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -2,9 +2,6 @@ OCAMLMAKEFILE = ../OCamlMakefile
+ 
+ PATH       := $(PATH):../syntax
+ 
+-OCAMLOPT   = ocamlopt.opt
+-OCAMLC     = ocamlc.opt
+-OCAMLDEP   = ocamldep.opt
+ OCAMLFLAGS =-w ae
+ LIBS       = nums str unix
+ 
+diff --git a/syntax/Makefile b/syntax/Makefile
+index 2542efa..1df38c9 100644
+--- a/syntax/Makefile
++++ b/syntax/Makefile
+@@ -1,8 +1,5 @@
+ OCAMLMAKEFILE = ../OCamlMakefile
+ 
+-OCAMLC     = ocamlc.opt
+-OCAMLOPT   = ocamlopt.opt
+-OCAMLDEP   = ocamldep.opt
+ ANNOTATE   = yes
+ PPFLAGS    = -loc loc
+ USE_CAMLP4 = yes
+-- 
diff --git a/debian/patches/0002-Add-missing-dynlink-library.patch 
b/debian/patches/0002-Add-missing-dynlink-library.patch
new file mode 100644
index 0000000..283c9ae
--- /dev/null
+++ b/debian/patches/0002-Add-missing-dynlink-library.patch
@@ -0,0 +1,23 @@
+From: Sylvain Le Gall <gil...@debian.org>
+Date: Mon, 18 Apr 2011 15:52:02 +0200
+Subject: Add missing dynlink library
+
+Signed-off-by: Sylvain Le Gall <gil...@debian.org>
+---
+ syntax/Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/syntax/Makefile b/syntax/Makefile
+index 1df38c9..5a24718 100644
+--- a/syntax/Makefile
++++ b/syntax/Makefile
+@@ -3,7 +3,7 @@ OCAMLMAKEFILE = ../OCamlMakefile
+ ANNOTATE   = yes
+ PPFLAGS    = -loc loc
+ USE_CAMLP4 = yes
+-LIBS       = camlp4lib unix
++LIBS       = dynlink camlp4lib unix
+ 
+ CAMLP4_PRE_NOPRINTER = 
+ 
+-- 
diff --git a/debian/patches/ocaml-deriving-no-link-libs 
b/debian/patches/0003-Do-not-link-libs-into-.cma-file.patch
similarity index 57%
rename from debian/patches/ocaml-deriving-no-link-libs
rename to debian/patches/0003-Do-not-link-libs-into-.cma-file.patch
index 0f1a754..49a95d7 100644
--- a/debian/patches/ocaml-deriving-no-link-libs
+++ b/debian/patches/0003-Do-not-link-libs-into-.cma-file.patch
@@ -1,8 +1,18 @@
-Index: ocaml-deriving/OCamlMakefile
-===================================================================
---- ocaml-deriving.orig/OCamlMakefile  2010-12-07 21:43:38.000000000 +0100
-+++ ocaml-deriving/OCamlMakefile       2010-12-07 21:43:49.000000000 +0100
-@@ -904,7 +904,7 @@
+From: Sylvain Le Gall <gil...@debian.org>
+Date: Mon, 18 Apr 2011 15:48:00 +0200
+Subject: Do not link libs into .cma file
+
+Signed-off-by: Sylvain Le Gall <gil...@debian.org>
+Signed-off-by: Stephane Glondu <st...@glondu.net>
+---
+ OCamlMakefile |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/OCamlMakefile b/OCamlMakefile
+index 731736e..c674c9f 100644
+--- a/OCamlMakefile
++++ b/OCamlMakefile
+@@ -904,7 +904,7 @@ endif
  
  ifndef LIB_PACK_NAME
  $(RESULT).cma:                $(REAL_IMPL_INTF) $(MAKEDLL) $(EXTRADEPS) 
$(RESULTDEPS)
@@ -11,7 +21,7 @@ Index: ocaml-deriving/OCamlMakefile
                                $(OBJS_LIBS) -o $@ $(OCAMLBLDFLAGS) $(REAL_IMPL)
  
  $(RESULT).cmxa $(RESULT).$(EXT_LIB):  $(REAL_IMPL_INTF) $(EXTRADEPS) 
$(RESULTDEPS)
-@@ -920,7 +920,7 @@
+@@ -920,7 +920,7 @@ $(LIB_PACK_NAME).cmi $(LIB_PACK_NAME).cmx: 
$(REAL_IMPL_INTF)
  endif
  
  $(RESULT).cma:                $(LIB_PACK_NAME).cmi $(LIB_PACK_NAME).cmo 
$(MAKEDLL) $(EXTRADEPS) $(RESULTDEPS)
@@ -20,3 +30,4 @@ Index: ocaml-deriving/OCamlMakefile
                                $(OBJS_LIBS) -o $@ $(OCAMLBLDFLAGS) 
$(LIB_PACK_NAME).cmo
  
  $(RESULT).cmxa $(RESULT).$(EXT_LIB):  $(LIB_PACK_NAME).cmi 
$(LIB_PACK_NAME).cmx $(EXTRADEPS) $(RESULTDEPS)
+-- 
diff --git a/debian/patches/debian-changes-0.1.1a-1 
b/debian/patches/debian-changes-0.1.1a-1
deleted file mode 100644
index d50ecfb..0000000
--- a/debian/patches/debian-changes-0.1.1a-1
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: Upstream changes introduced in version 0.1.1a-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- ocaml-deriving (0.1.1a-1) unstable; urgency=low
- .
-   * Initial release. (Closes: #605682)
- .
- The person named in the Author field signed this changelog entry.
-Author: Sylvain Le Gall <gil...@debian.org>
-Bug-Debian: http://bugs.debian.org/605682
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- ocaml-deriving-0.1.1a.orig/syntax/Makefile
-+++ ocaml-deriving-0.1.1a/syntax/Makefile
-@@ -1,12 +1,9 @@
- OCAMLMAKEFILE = ../OCamlMakefile
- 
--OCAMLC     = ocamlc.opt
--OCAMLOPT   = ocamlopt.opt
--OCAMLDEP   = ocamldep.opt
- ANNOTATE   = yes
- PPFLAGS    = -loc loc
- USE_CAMLP4 = yes
--LIBS       = camlp4lib unix
-+LIBS       = dynlink camlp4lib unix
- 
- CAMLP4_PRE_NOPRINTER = 
- 
---- ocaml-deriving-0.1.1a.orig/lib/Makefile
-+++ ocaml-deriving-0.1.1a/lib/Makefile
-@@ -2,9 +2,6 @@ OCAMLMAKEFILE = ../OCamlMakefile
- 
- PATH       := $(PATH):../syntax
- 
--OCAMLOPT   = ocamlopt.opt
--OCAMLC     = ocamlc.opt
--OCAMLDEP   = ocamldep.opt
- OCAMLFLAGS =-w ae
- LIBS       = nums str unix
- 
diff --git a/debian/patches/series b/debian/patches/series
index 27bb0f3..9ac5285 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
-debian-changes-0.1.1a-1
-ocaml-deriving-no-link-libs
+0001-Do-not-force-.opt-compilers.patch
+0002-Add-missing-dynlink-library.patch
+0003-Do-not-link-libs-into-.cma-file.patch
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..c4cf480
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+abort-on-upstream-changes
+unapply-patches
diff --git a/lib/Makefile b/lib/Makefile
index 7ad6241..b1fd7eb 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -2,6 +2,9 @@ OCAMLMAKEFILE = ../OCamlMakefile
 
 PATH       := $(PATH):../syntax
 
+OCAMLOPT   = ocamlopt.opt
+OCAMLC     = ocamlc.opt
+OCAMLDEP   = ocamldep.opt
 OCAMLFLAGS =-w ae
 LIBS       = nums str unix
 
diff --git a/syntax/Makefile b/syntax/Makefile
index 5a24718..2542efa 100644
--- a/syntax/Makefile
+++ b/syntax/Makefile
@@ -1,9 +1,12 @@
 OCAMLMAKEFILE = ../OCamlMakefile
 
+OCAMLC     = ocamlc.opt
+OCAMLOPT   = ocamlopt.opt
+OCAMLDEP   = ocamldep.opt
 ANNOTATE   = yes
 PPFLAGS    = -loc loc
 USE_CAMLP4 = yes
-LIBS       = dynlink camlp4lib unix
+LIBS       = camlp4lib unix
 
 CAMLP4_PRE_NOPRINTER = 
 

-- 
ocaml-deriving packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to