[Pkg-ocaml-maint-commits] [SCM] ocaml-deriving-ocsigen packaging branch, master, updated. debian/0.1.1a-3-26-g550e6e9
The following commit has been merged in the master branch: commit 550e6e932b62e59366d2c7020643fe15dbc3acff Author: Stephane Glondu Date: Mon Nov 21 20:45:15 2011 +0100 Pass $(MAKE_EXTRA_VARS) to calls to $(MAKE) in rules diff --git a/debian/rules b/debian/rules index f7545c9..159b0b8 100755 --- a/debian/rules +++ b/debian/rules @@ -29,12 +29,12 @@ endif .PHONY: override_dh_auto_build override_dh_auto_build: - $(MAKE) $(BUILD_TARGET) + $(MAKE) $(MAKE_EXTRA_VARS) $(BUILD_TARGET) .PHONY: override_dh_auto_install override_dh_auto_install: mkdir -p $(OCAMLFIND_DESTDIR) - $(MAKE) $(INSTALL_TARGET) + $(MAKE) $(MAKE_EXTRA_VARS) $(INSTALL_TARGET) .PHONY: override_dh_install override_dh_install: -- 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
[Pkg-ocaml-maint-commits] [SCM] ocaml-deriving-ocsigen packaging branch, master, updated. debian/0.1.1a-3-26-g550e6e9
The following commit has been merged in the master branch: commit 83fd0c83c4195129a5f025666bc3ede8c441668d Author: Stephane Glondu Date: Mon Nov 21 20:27:30 2011 +0100 Update debian/copyright to more recent specification diff --git a/debian/copyright b/debian/copyright index 10abff6..feca3ae 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,24 +1,22 @@ -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 -Name: ocaml-deriving-ocsigen -Maintainer: Sylvain Le Gall +Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202 +Upstream-Name: deriving-ocsigen +Upstream-Contact: The Ocsigen Team Source: https://github.com/hnrgrgr/deriving -Upstream-Maintainer: The Ocsigen Team Files: * Copyright: (c) 2007 Jeremy Yallop (c) 2011 Gregoire Henry License: MIT - Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -30,5 +28,4 @@ License: MIT Files: debian/* Copyright: (C) 2010 Sylvain Le Gall License: GPL-3+ - See '/usr/share/common-licenses/GPL-3' for the full text. -- 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
[Pkg-ocaml-maint-commits] [SCM] ocaml-deriving-ocsigen packaging branch, master, updated. debian/0.1.1a-3-26-g550e6e9
The following commit has been merged in the master branch: commit e5a01833b5483972cef665292f5a2d58963ce093 Author: Stephane Glondu Date: Mon Nov 21 21:12:42 2011 +0100 Fix debhelper files diff --git a/debian/libderiving-ocsigen-ocaml-dev.install.in b/debian/libderiving-ocsigen-ocaml-dev.install.in index c7d9918..a55b91d 100644 --- a/debian/libderiving-ocsigen-ocaml-dev.install.in +++ b/debian/libderiving-ocsigen-ocaml-dev.install.in @@ -1,5 +1,9 @@ @OCamlStdlibDir@/deriving-ocsigen/*.cmi @OCamlStdlibDir@/deriving-ocsigen/*.mli +@OCamlStdlibDir@/deriving-ocsigen/pa_deriving_tc.cma +@OCamlStdlibDir@/deriving-ocsigen/pa_deriving.cma +DYN: @OCamlStdlibDir@/deriving-ocsigen/pa_deriving_tc.cmxs +DYN: @OCamlStdlibDir@/deriving-ocsigen/pa_deriving.cmxs OPT: @OCamlStdlibDir@/deriving-ocsigen/*.cmxa OPT: @OCamlStdlibDir@/deriving-ocsigen/*.a OPT: @OCamlStdlibDir@/deriving-ocsigen/*.cmx diff --git a/debian/libderiving-ocsigen-ocaml.install.in b/debian/libderiving-ocsigen-ocaml.install.in index fc62b8b..3aeb86b 100644 --- a/debian/libderiving-ocsigen-ocaml.install.in +++ b/debian/libderiving-ocsigen-ocaml.install.in @@ -1,2 +1,3 @@ @OCamlStdlibDir@/deriving-ocsigen/META -@OCamlStdlibDir@/deriving-ocsigen/*.cma +@OCamlStdlibDir@/deriving-ocsigen/deriving.cma +DYN: @OCamlStdlibDir@/deriving-ocsigen/deriving.cmxs \ No newline at end of file -- 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
[Pkg-ocaml-maint-commits] [SCM] ocaml-deriving-ocsigen packaging branch, master, updated. debian/0.1.1a-3-26-g550e6e9
The following commit has been merged in the master branch:
commit 648905509cf49f95433969c814c5f15678fde103
Author: Stephane Glondu
Date: Mon Nov 21 20:23:10 2011 +0100
Add missing ${shlibs:Depends}
diff --git a/debian/control b/debian/control
index f83c893..99b03f8 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,10 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-deriving-oc
Package: libderiving-ocsigen-ocaml-dev
Architecture: any
-Depends: ${ocaml:Depends}, ${misc:Depends}
+Depends:
+ ${shlibs:Depends},
+ ${ocaml:Depends},
+ ${misc:Depends}
Provides: ${ocaml:Provides}
Recommends: ocaml-findlib
Description: deriving functions from type declarations in OCaml (devt files)
@@ -30,7 +33,10 @@ Description: deriving functions from type declarations in
OCaml (devt files)
Package: libderiving-ocsigen-ocaml
Architecture: any
-Depends: ${ocaml:Depends}, ${misc:Depends}
+Depends:
+ ${shlibs:Depends},
+ ${ocaml:Depends},
+ ${misc:Depends}
Provides: ${ocaml:Provides}
Recommends: ocaml-findlib
Description: deriving functions from type declarations in OCaml (runtime)
--
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
[Pkg-ocaml-maint-commits] [SCM] ocaml-deriving-ocsigen packaging branch, master, updated. debian/0.1.1a-3-26-g550e6e9
The following commit has been merged in the master branch:
commit cd315d022f50a30a27e3d2d389f4ecaf8ea2b9fb
Author: Pierre Chambart
Date: Mon Nov 21 17:54:13 2011 +0100
Install cmx
diff --git a/debian/patches/0006-Install-cmx.patch
b/debian/patches/0006-Install-cmx.patch
new file mode 100644
index 000..5b6d28c
--- /dev/null
+++ b/debian/patches/0006-Install-cmx.patch
@@ -0,0 +1,31 @@
+From: Pierre Chambart
+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/series b/debian/patches/series
index 864ba22..cc1b4aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
0003-syntax-package-exists-only-when-dev-is-installed.patch
0004-build-cmxs.patch
0005-remove-syntax.base-package.patch
+0006-Install-cmx.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
[Pkg-ocaml-maint-commits] [SCM] ocaml-deriving-ocsigen packaging branch, master, updated. debian/0.1.1a-3-26-g550e6e9
The following commit has been merged in the master branch:
commit c0fad214739c34e51c53c46b4e8336036bac11e3
Author: Pierre Chambart
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 000..4714214
--- /dev/null
+++ b/debian/patches/0005-remove-syntax.base-package.patch
@@ -0,0 +1,71 @@
+From: Pierre Chambart
+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
___
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
[Pkg-ocaml-maint-commits] [SCM] ocaml-deriving-ocsigen packaging branch, master, updated. debian/0.1.1a-3-26-g550e6e9
The following commit has been merged in the master branch: commit 5d8cd569ec8c76cf2059d4d0534e9ccc7773de35 Author: Pierre Chambart Date: Mon Nov 21 20:13:55 2011 +0100 check for natdynlink in rules diff --git a/debian/rules b/debian/rules index 71374d8..f7545c9 100755 --- a/debian/rules +++ b/debian/rules @@ -18,6 +18,12 @@ else INSTALL_TARGET := install-byte endif +ifeq ($(OCAML_NATDYNLINK),yes) + MAKE_EXTRA_VARS := +else + MAKE_EXTRA_VARS := NATDYNLINK=NO +endif + %: dh --with ocaml $@ -- 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
[Pkg-ocaml-maint-commits] [SCM] ocaml-deriving-ocsigen packaging branch, master, updated. debian/0.1.1a-3-26-g550e6e9
The following commit has been merged in the master branch:
commit 8f6b482018b09879346d63694294e5ce0bed8354
Author: Pierre Chambart
Date: Mon Nov 21 20:13:16 2011 +0100
build cmxs
diff --git a/debian/patches/0004-build-cmxs.patch
b/debian/patches/0004-build-cmxs.patch
new file mode 100644
index 000..4162f64
--- /dev/null
+++ b/debian/patches/0004-build-cmxs.patch
@@ -0,0 +1,104 @@
+From: Pierre Chambart
+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/series b/debian/patches/series
index c0a697b..db5da2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
0001-Install-.mli.patch
0002-install-syntax-extension-.a.patch
0003-syntax-package-exists-only-when-dev-is-installed.patch
+0004-build-cmxs.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
[Pkg-ocaml-maint-commits] [SCM] ocaml-deriving-ocsigen packaging branch, master, updated. debian/0.1.1a-3-26-g550e6e9
The following commit has been merged in the master branch: commit 11fcc7ff44ad5b0955858b5f7a7f0ef00c4c13b0 Author: Pierre Chambart Date: Mon Nov 21 16:00:20 2011 +0100 syntax package exists only when -dev is installed 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 new file mode 100644 index 000..b3bedf0 --- /dev/null +++ b/debian/patches/0003-syntax-package-exists-only-when-dev-is-installed.patch @@ -0,0 +1,21 @@ +From: Pierre Chambart +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/series b/debian/patches/series index e440b9e..c0a697b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 0001-Install-.mli.patch 0002-install-syntax-extension-.a.patch +0003-syntax-package-exists-only-when-dev-is-installed.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
