[Pkg-ocaml-maint-commits] [SCM] ocaml-deriving-ocsigen packaging branch, master, updated. debian/0.1.1a-3-26-g550e6e9

[Stephane Glondu]

The following commit has been merged in the master branch:
commit c0fad214739c34e51c53c46b4e8336036bac11e3
Author: Pierre Chambart <chambart at crans.org>
Date:   Mon Nov 21 20:13:39 2011 +0100

    remove syntax.base package

diff --git a/debian/patches/0005-remove-syntax.base-package.patch b/debian/patches/0005-remove-syntax.base-package.patch
new file mode 100644
index 0000000..4714214
--- /dev/null
+++ b/debian/patches/0005-remove-syntax.base-package.patch
@@ -0,0 +1,71 @@
+From: Pierre Chambart <chambart at 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/series b/debian/patches/series
index db5da2d..864ba22 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 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

-- 
ocaml-deriving-ocsigen packaging