[Pkg-ocaml-maint-commits] [SCM] ocaml-deriving packaging branch, master, updated. debian/0.1.1a-1
Sylvain Le Gall
gildor at debian.org
Tue Dec 7 21:23:04 UTC 2010
The following commit has been merged in the master branch:
commit 14b82ce2c727ec271da4bea0ee662d5152a83e35
Author: Sylvain Le Gall <gildor at debian.org>
Date: Tue Dec 7 22:22:18 2010 +0100
Initial packaging
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)
- $(REAL_OCAMLFIND) $(REAL_OCAMLC) -a $(ALL_LDFLAGS) \
+ $(REAL_OCAMLFIND) $(REAL_OCAMLC) -a \
$(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 $(ALL_LDFLAGS) \
+ $(REAL_OCAMLFIND) $(REAL_OCAMLC) -a \
$(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/META b/debian/META
new file mode 100644
index 0000000..1a19e58
--- /dev/null
+++ b/debian/META
@@ -0,0 +1,3 @@
+name="deriving"
+version="0.1.1a"
+description="deriving functions"
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..6f9ec1f
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+ocaml-deriving (0.1.1a-1) unstable; urgency=low
+
+ * Initial release. (Closes: #605682)
+
+ -- Sylvain Le Gall <gildor at debian.org> Tue, 07 Dec 2010 22:21:04 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..f417c7f
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,39 @@
+Source: ocaml-deriving
+Section: ocaml
+Priority: optional
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Uploaders:
+ Sylvain Le Gall <gildor at debian.org>
+Build-Depends:
+ ocaml-nox (>= 3.11.1-3~),
+ ocaml-findlib,
+ dh-ocaml (>= 0.9~),
+ debhelper (>= 7.0.50~),
+ camlp4-extra
+Standards-Version: 3.9.1
+Homepage: http://code.google.com/p/deriving/
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-deriving.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-deriving.git
+
+Package: libderiving-ocaml-dev
+Architecture: any
+Depends: ${ocaml:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
+Recommends: ocaml-findlib
+Description: deriving functions from type declarations in OCaml
+ Camlp4 extension to OCaml for deriving functions from type declarations.
+ Includes derivers for pretty-printing, type-safe marshalling with
+ structure-sharing, dynamic typing, equality, and more.
+
+
+Package: libderiving-ocaml
+Architecture: any
+Depends: ${ocaml:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
+Recommends: ocaml-findlib
+Description: deriving functions from type declarations in OCaml
+ Camlp4 extension to OCaml for deriving functions from type declarations.
+ Includes derivers for pretty-printing, type-safe marshalling with
+ structure-sharing, dynamic typing, equality, and more.
+ .
+ This package contains the shared runtime libraries.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..9c7bf66
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,31 @@
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: ocaml-deriving
+Maintainer: Sylvain Le Gall <gildor at debian.org>
+
+Files: *
+Copyright: Copyright (c) 2007 Jeremy Yallop
+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
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+Files: debian/*
+Copyright: (C) 2010 Sylvain Le Gall <gildor at debian.org>
+License: GPL-3+
+
+ See '/usr/share/common-licenses/GPL-3' for the full text.
diff --git a/debian/deriving.1 b/debian/deriving.1
new file mode 100644
index 0000000..7f39fd0
--- /dev/null
+++ b/debian/deriving.1
@@ -0,0 +1,17 @@
+.TH DERIVING 1 "December 7, 2010" "deriving User Manual"
+.SH NAME
+.PP
+deriving - camlp4 with deriving syntax extension.
+.SH SYNOPSIS
+.PP
+deriving [options] file
+.SH DESCRIPTION
+.PP
+This executable is camlp4 relinked with the deriving syntax
+extension.
+.SH SEE ALSO
+.PP
+\f[B]camlp4\f[] (1)
+.SH AUTHORS
+Sylvain Le Gall.
+
diff --git a/debian/deriving.mkd b/debian/deriving.mkd
new file mode 100644
index 0000000..b71215f
--- /dev/null
+++ b/debian/deriving.mkd
@@ -0,0 +1,19 @@
+% DERIVING(1) deriving User Manual
+% Sylvain Le Gall
+% December 7, 2010
+
+# NAME
+
+deriving - camlp4 with deriving syntax extension.
+
+# SYNOPSIS
+
+deriving [options] file
+
+# DESCRIPTION
+
+This executable is camlp4 relinked with the deriving syntax extension.
+
+# SEE ALSO
+
+`camlp4` (1)
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..cec628c
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
diff --git a/debian/libderiving-ocaml-dev.install.in b/debian/libderiving-ocaml-dev.install.in
new file mode 100644
index 0000000..e7da591
--- /dev/null
+++ b/debian/libderiving-ocaml-dev.install.in
@@ -0,0 +1,6 @@
+ at OCamlStdlibDir@/deriving/*.cmi
+ at OCamlStdlibDir@/deriving/*.mli
+OPT: @OCamlStdlibDir@/deriving/*.cmxa
+OPT: @OCamlStdlibDir@/deriving/*.a
+OPT: @OCamlStdlibDir@/deriving/*.cmx
+/usr/bin/deriving
diff --git a/debian/libderiving-ocaml-dev.manpages b/debian/libderiving-ocaml-dev.manpages
new file mode 100644
index 0000000..cbd6757
--- /dev/null
+++ b/debian/libderiving-ocaml-dev.manpages
@@ -0,0 +1 @@
+debian/deriving.1
diff --git a/debian/libderiving-ocaml-dev.ocamldoc b/debian/libderiving-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..c01ade2
--- /dev/null
+++ b/debian/libderiving-ocaml-dev.ocamldoc
@@ -0,0 +1 @@
+# Nothing
diff --git a/debian/libderiving-ocaml.install.in b/debian/libderiving-ocaml.install.in
new file mode 100644
index 0000000..1e48ec9
--- /dev/null
+++ b/debian/libderiving-ocaml.install.in
@@ -0,0 +1,2 @@
+ at OCamlStdlibDir@/deriving/META
+ at OCamlStdlibDir@/deriving/*.cma
diff --git a/debian/patches/debian-changes-0.1.1a-1 b/debian/patches/debian-changes-0.1.1a-1
new file mode 100644
index 0000000..d50ecfb
--- /dev/null
+++ b/debian/patches/debian-changes-0.1.1a-1
@@ -0,0 +1,54 @@
+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 <gildor at 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/ocaml-deriving-no-link-libs b/debian/patches/ocaml-deriving-no-link-libs
new file mode 100644
index 0000000..0f1a754
--- /dev/null
+++ b/debian/patches/ocaml-deriving-no-link-libs
@@ -0,0 +1,22 @@
+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 @@
+
+ ifndef LIB_PACK_NAME
+ $(RESULT).cma: $(REAL_IMPL_INTF) $(MAKEDLL) $(EXTRADEPS) $(RESULTDEPS)
+- $(REAL_OCAMLFIND) $(REAL_OCAMLC) -a $(ALL_LDFLAGS) \
++ $(REAL_OCAMLFIND) $(REAL_OCAMLC) -a \
+ $(OBJS_LIBS) -o $@ $(OCAMLBLDFLAGS) $(REAL_IMPL)
+
+ $(RESULT).cmxa $(RESULT).$(EXT_LIB): $(REAL_IMPL_INTF) $(EXTRADEPS) $(RESULTDEPS)
+@@ -920,7 +920,7 @@
+ endif
+
+ $(RESULT).cma: $(LIB_PACK_NAME).cmi $(LIB_PACK_NAME).cmo $(MAKEDLL) $(EXTRADEPS) $(RESULTDEPS)
+- $(REAL_OCAMLFIND) $(REAL_OCAMLC) -a $(ALL_LDFLAGS) \
++ $(REAL_OCAMLFIND) $(REAL_OCAMLC) -a \
+ $(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/series b/debian/patches/series
new file mode 100644
index 0000000..27bb0f3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+debian-changes-0.1.1a-1
+ocaml-deriving-no-link-libs
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..5a49c71
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,47 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DESTDIR=$(CURDIR)/debian/tmp
+
+include /usr/share/ocaml/ocamlvars.mk
+
+OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
+export OCAMLFIND_DESTDIR
+OCAMLFIND_LDCONF=ignore
+export OCAMLFIND_LDCONF
+
+%:
+ dh --with ocaml $@
+
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+ $(MAKE) built
+else
+ $(MAKE) -C syntax
+ $(MAKE) -C lib bcl
+endif
+
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
+ mkdir -p '$(OCAMLFIND_DESTDIR)'
+ mkdir -p '$(DESTDIR)/usr/bin'
+ ocamlfind install deriving \
+ debian/META \
+ -patch-version $$(dpkg-parsechangelog | grep 'Version: ' | cut -d : -f 2) \
+ $(wildcard lib/*.cma lib/*.cmxa lib/*.a lib/*.mli lib/*.cmi lib/*.cmx)
+ install -m 0755 syntax/deriving '$(DESTDIR)/usr/bin'
+
+.PHONY: override_dh_install
+override_dh_install:
+ dh_install --fail-missing
+
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+ $(MAKE) clean
+
+debian/%.1: debian/%.mkd
+ pandoc -s -w man $^ -o $@
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..620fd46
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://code.google.com/p/deriving/downloads/list http://deriving.googlecode.com/files/deriving-(.*)\.tar\.gz
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..5a24718 100644
--- a/syntax/Makefile
+++ b/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 packaging
More information about the Pkg-ocaml-maint-commits
mailing list