The following commit has been merged in the master branch: commit 54b0d1a74b71a33b80d4cb6d78081a793138cb99 Author: Stephane Glondu <st...@glondu.net> Date: Fri Nov 25 22:27:55 2011 +0100
Remove all patches diff --git a/debian/patches/0001-Install-.mli.patch b/debian/patches/0001-Install-.mli.patch deleted file mode 100644 index a5bbfdb..0000000 --- a/debian/patches/0001-Install-.mli.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Pierre Chambart <chamb...@crans.org> -Date: Tue, 15 Nov 2011 15:32:19 +0100 -Subject: Install .mli - ---- - Makefile | 6 +++--- - Makefile.filelist | 5 +++-- - 2 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index e496e54..6b816da 100644 ---- a/Makefile -+++ b/Makefile -@@ -39,17 +39,17 @@ VERSION := $(shell head -n 1 VERSION) - install: - ${OCAMLFIND} install ${PROJECTNAME} \ - -patch-version ${VERSION} \ -- META ${INTF} ${IMPL} ${NATIMPL} -+ META ${INTF} ${IMPL} ${SYNTAX_INTF} ${NATIMPL} ${INTF:.cmi=.mli} - - install-byte: - ${OCAMLFIND} install ${PROJECTNAME} \ - -patch-version ${VERSION} \ -- META ${INTF} ${IMPL} -+ META ${INTF} ${IMPL} ${SYNTAX_INTF} ${INTF:.cmi=.mli} - - install-opt: - ${OCAMLFIND} install ${PROJECTNAME} \ - -patch-version ${VERSION} \ -- META ${INTF} ${NATIMPL} -+ META ${INTF} ${NATIMPL} ${SYNTAX_INTF} ${INTF:.cmi=.mli} - - uninstall: - ${OCAMLFIND} remove ${PROJECTNAME} -diff --git a/Makefile.filelist b/Makefile.filelist -index 27f6122..46f4518 100644 ---- a/Makefile.filelist -+++ b/Makefile.filelist -@@ -1,5 +1,6 @@ --INTF := syntax/pa_deriving_common.cmi \ -- lib/deriving_Dump.cmi \ -+SYNTAX_INTF := syntax/pa_deriving_common.cmi -+ -+INTF := lib/deriving_Dump.cmi \ - lib/deriving_monad.cmi \ - lib/deriving_dynmap.cmi \ - lib/deriving_Show.cmi \ --- diff --git a/debian/patches/0002-install-syntax-extension-.a.patch b/debian/patches/0002-install-syntax-extension-.a.patch deleted file mode 100644 index 33d5509..0000000 --- a/debian/patches/0002-install-syntax-extension-.a.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Pierre Chambart <chamb...@crans.org> -Date: Tue, 15 Nov 2011 15:57:49 +0100 -Subject: install syntax extension .a - ---- - Makefile.filelist | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/Makefile.filelist b/Makefile.filelist -index 46f4518..48c050b 100644 ---- a/Makefile.filelist -+++ b/Makefile.filelist -@@ -20,6 +20,7 @@ IMPL := syntax/pa_deriving_common.cmo \ - NATIMPL := syntax/pa_deriving_common.cmx \ - syntax/pa_deriving.cmx \ - syntax/pa_deriving.cmxa \ -+ syntax/pa_deriving.a \ - lib/deriving.cmxa \ - lib/deriving.a \ - -@@ -30,5 +31,6 @@ IMPL += syntax/pa_deriving_tc.cmo \ - - NATIMPL += syntax/pa_deriving_tc.cmx \ - syntax/pa_deriving_tc.cmxa \ -+ syntax/pa_deriving_tc.a - - endif --- diff --git a/debian/patches/0003-syntax-package-exists-only-when-dev-is-installed.patch b/debian/patches/0003-syntax-package-exists-only-when-dev-is-installed.patch deleted file mode 100644 index b3bedf0..0000000 --- a/debian/patches/0003-syntax-package-exists-only-when-dev-is-installed.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Pierre Chambart <chamb...@crans.org> -Date: Mon, 21 Nov 2011 15:59:31 +0100 -Subject: syntax package exists only when -dev is installed - ---- - META.in | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/META.in b/META.in -index f525d10..3281177 100644 ---- a/META.in -+++ b/META.in -@@ -6,6 +6,7 @@ archive(byte) = "deriving.cma" - archive(native) = "deriving.cmxa" - - package "syntax" ( -+ exists_if = "pa_deriving.cma" - requires(syntax) = "camlp4,unix" - requires(syntax, toploop) += "%%NAME%%" - archive(syntax, preprocessor) = "pa_deriving.cma" --- diff --git a/debian/patches/0004-build-cmxs.patch b/debian/patches/0004-build-cmxs.patch deleted file mode 100644 index 4162f64..0000000 --- a/debian/patches/0004-build-cmxs.patch +++ /dev/null @@ -1,104 +0,0 @@ -From: Pierre Chambart <chamb...@crans.org> -Date: Mon, 21 Nov 2011 16:54:02 +0100 -Subject: build cmxs - ---- - Makefile.config | 2 ++ - Makefile.filelist | 9 ++++++++- - lib/Makefile | 7 ++++++- - syntax/Makefile | 8 ++++++++ - 4 files changed, 24 insertions(+), 2 deletions(-) - -diff --git a/Makefile.config b/Makefile.config -index b2fa5d3..6b33f7b 100644 ---- a/Makefile.config -+++ b/Makefile.config -@@ -2,4 +2,6 @@ - PROJECTNAME := deriving-ocsigen - OCAMLFIND := ocamlfind - -+NATDYNLINK :=YES -+ - TYPECONV := $(shell ${OCAMLFIND} query type-conv 2>/dev/null) -diff --git a/Makefile.filelist b/Makefile.filelist -index 48c050b..d9b59a6 100644 ---- a/Makefile.filelist -+++ b/Makefile.filelist -@@ -22,7 +22,11 @@ NATIMPL := syntax/pa_deriving_common.cmx \ - syntax/pa_deriving.cmxa \ - syntax/pa_deriving.a \ - lib/deriving.cmxa \ -- lib/deriving.a \ -+ lib/deriving.a -+ifeq "${NATDYNLINK}" "YES" -+NATIMPL += syntax/pa_deriving.cmxs \ -+ lib/deriving.cmxs -+endif - - ifneq (${TYPECONV},) - -@@ -32,5 +36,8 @@ IMPL += syntax/pa_deriving_tc.cmo \ - NATIMPL += syntax/pa_deriving_tc.cmx \ - syntax/pa_deriving_tc.cmxa \ - syntax/pa_deriving_tc.a -+ifeq "${NATDYNLINK}" "YES" -+NATIMPL += syntax/pa_deriving_tc.cmxs -+endif - - endif -diff --git a/lib/Makefile b/lib/Makefile -index c531c2a..8dd35ca 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -24,7 +24,10 @@ SOURCES = deriving_Show.ml \ - all: byte opt - - byte: deriving.cma --opt: deriving.cmxa -+opt:: deriving.cmxa -+ifeq "${NATDYNLINK}" "YES" -+opt:: deriving.cmxs -+endif - - ## - -@@ -41,6 +44,8 @@ deriving.cmxa: ${SOURCES:.ml=.cmx} - ${OCAMLC} ${OCAMLFLAGS} ${PP} -c $< - %.cmx: %.ml - ${OCAMLOPT} ${OCAMLFLAGS} ${PP} -c $< -+%.cmxs: %.cmxa -+ $(OCAMLOPT) -shared -linkall -o $@ $< - - # Clean up - clean: -diff --git a/syntax/Makefile b/syntax/Makefile -index abcc746..cf7ba51 100644 ---- a/syntax/Makefile -+++ b/syntax/Makefile -@@ -49,10 +49,16 @@ all: byte opt - - byte:: pa_deriving.cma deriving - opt:: pa_deriving.cmxa deriving.opt -+ifeq "${NATDYNLINK}" "YES" -+opt:: pa_deriving.cmxs -+endif - - ifneq (${TYPECONV},) - byte:: pa_deriving_tc.cma - opt:: pa_deriving_tc.cmxa -+ifeq "${NATDYNLINK}" "YES" -+opt:: pa_deriving_tc.cmxs -+endif - endif - - ## -@@ -102,6 +108,8 @@ id.ml: id.mlp ../Makefile.config ../VERSION - ${OCAMLC} ${LIBS} -c $< - %.cmx: %.ml - ${OCAMLOPT} ${LIBS} ${FOR_PACK} -c $< -+%.cmxs: %.cmxa -+ $(OCAMLOPT) -shared -linkall -o $@ $< - - # Clean up - clean: --- diff --git a/debian/patches/0005-remove-syntax.base-package.patch b/debian/patches/0005-remove-syntax.base-package.patch deleted file mode 100644 index 4714214..0000000 --- a/debian/patches/0005-remove-syntax.base-package.patch +++ /dev/null @@ -1,71 +0,0 @@ -From: Pierre Chambart <chamb...@crans.org> -Date: Mon, 21 Nov 2011 17:32:42 +0100 -Subject: remove syntax.base package - ---- - META.in | 10 ---------- - Makefile.filelist | 14 ++++---------- - 2 files changed, 4 insertions(+), 20 deletions(-) - -diff --git a/META.in b/META.in -index 3281177..a3e0aea 100644 ---- a/META.in -+++ b/META.in -@@ -11,11 +11,6 @@ package "syntax" ( - requires(syntax, toploop) += "%%NAME%%" - archive(syntax, preprocessor) = "pa_deriving.cma" - archive(syntax, toploop) = "pa_deriving.cma" -- package "base" ( -- requires(syntax) = "camlp4" -- archive(syntax, preprocessor) = "pa_deriving_common.cmo pa_deriving.cmo" -- archive(syntax, toploop) = "pa_deriving_common.cmo pa_deriving.cmo" -- ) - ) - - ## Presence of type-conv shoud be detected with the predicate "pkg_type-conv" -@@ -27,9 +22,4 @@ package "syntax_tc" ( - requires(syntax, toploop) += "%%NAME%%" - archive(syntax, preprocessor) = "pa_deriving_tc.cma" - archive(syntax, toploop) = "pa_deriving_tc.cma" -- package "base" ( -- requires(syntax) = "camlp4" -- archive(syntax, preprocessor) = "pa_deriving_common.cmo pa_deriving_tc.cmo" -- archive(syntax, toploop) = "pa_deriving_common.cmo pa_deriving_tc.cmo" -- ) - ) -diff --git a/Makefile.filelist b/Makefile.filelist -index d9b59a6..59f72f3 100644 ---- a/Makefile.filelist -+++ b/Makefile.filelist -@@ -12,14 +12,10 @@ INTF := lib/deriving_Dump.cmi \ - lib/deriving_Eq.cmi \ - lib/deriving_Pickle.cmi \ - --IMPL := syntax/pa_deriving_common.cmo \ -- syntax/pa_deriving.cmo \ -- syntax/pa_deriving.cma \ -+IMPL := syntax/pa_deriving.cma \ - lib/deriving.cma \ - --NATIMPL := syntax/pa_deriving_common.cmx \ -- syntax/pa_deriving.cmx \ -- syntax/pa_deriving.cmxa \ -+NATIMPL := syntax/pa_deriving.cmxa \ - syntax/pa_deriving.a \ - lib/deriving.cmxa \ - lib/deriving.a -@@ -30,11 +26,9 @@ endif - - ifneq (${TYPECONV},) - --IMPL += syntax/pa_deriving_tc.cmo \ -- syntax/pa_deriving_tc.cma \ -+IMPL += syntax/pa_deriving_tc.cma \ - --NATIMPL += syntax/pa_deriving_tc.cmx \ -- syntax/pa_deriving_tc.cmxa \ -+NATIMPL += syntax/pa_deriving_tc.cmxa \ - syntax/pa_deriving_tc.a - ifeq "${NATDYNLINK}" "YES" - NATIMPL += syntax/pa_deriving_tc.cmxs --- diff --git a/debian/patches/0006-Install-cmx.patch b/debian/patches/0006-Install-cmx.patch deleted file mode 100644 index 5b6d28c..0000000 --- a/debian/patches/0006-Install-cmx.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Pierre Chambart <chamb...@crans.org> -Date: Mon, 21 Nov 2011 17:54:02 +0100 -Subject: Install cmx - ---- - Makefile | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 6b816da..d0b67c4 100644 ---- a/Makefile -+++ b/Makefile -@@ -39,7 +39,7 @@ VERSION := $(shell head -n 1 VERSION) - install: - ${OCAMLFIND} install ${PROJECTNAME} \ - -patch-version ${VERSION} \ -- META ${INTF} ${IMPL} ${SYNTAX_INTF} ${NATIMPL} ${INTF:.cmi=.mli} -+ META ${INTF} ${IMPL} ${SYNTAX_INTF} ${NATIMPL} ${INTF:.cmi=.mli} ${INTF:.cmi=.cmx} - - install-byte: - ${OCAMLFIND} install ${PROJECTNAME} \ -@@ -49,7 +49,7 @@ install-byte: - install-opt: - ${OCAMLFIND} install ${PROJECTNAME} \ - -patch-version ${VERSION} \ -- META ${INTF} ${NATIMPL} ${SYNTAX_INTF} ${INTF:.cmi=.mli} -+ META ${INTF} ${NATIMPL} ${SYNTAX_INTF} ${INTF:.cmi=.mli} ${INTF:.cmi=.cmx} - - uninstall: - ${OCAMLFIND} remove ${PROJECTNAME} --- diff --git a/debian/patches/0007-Do-not-build-deriving-executables.patch b/debian/patches/0007-Do-not-build-deriving-executables.patch deleted file mode 100644 index 1ead6db..0000000 --- a/debian/patches/0007-Do-not-build-deriving-executables.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Stephane Glondu <st...@glondu.net> -Date: Tue, 22 Nov 2011 20:14:51 +0100 -Subject: Do not build deriving executables - ---- - syntax/Makefile | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/syntax/Makefile b/syntax/Makefile -index cf7ba51..5dc9f59 100644 ---- a/syntax/Makefile -+++ b/syntax/Makefile -@@ -47,8 +47,8 @@ PREDEP := id.ml - - all: byte opt - --byte:: pa_deriving.cma deriving --opt:: pa_deriving.cmxa deriving.opt -+byte:: pa_deriving.cma -+opt:: pa_deriving.cmxa - ifeq "${NATDYNLINK}" "YES" - opt:: pa_deriving.cmxs - endif --- diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 562454b..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,7 +0,0 @@ -0001-Install-.mli.patch -0002-install-syntax-extension-.a.patch -0003-syntax-package-exists-only-when-dev-is-installed.patch -0004-build-cmxs.patch -0005-remove-syntax.base-package.patch -0006-Install-cmx.patch -0007-Do-not-build-deriving-executables.patch -- ocaml-deriving-ocsigen packaging _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits