[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, master, updated. debian/0.1.0-2-12-g6155aa1
The following commit has been merged in the master branch: commit c3638042d306399da1af14ce07fe960180d26279 Author: Stephane Glondu st...@glondu.net Date: Sun Jun 26 22:49:07 2011 +0200 Fix watch file diff --git a/debian/watch b/debian/watch index fbc728e..7e9b995 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://ocaml.janestreet.com/?q=node/13 .*/fieldslib-(.*)\.tgz +http://ocaml.janestreet.com/?q=node/13 .*/fieldslib-(.*)\.tar\.gz -- fieldslib 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] fieldslib packaging branch, master, updated. debian/0.1.0-2-12-g6155aa1
The following commit has been merged in the master branch: commit 76ab84df353e1e1d95320048056d76e966fe90f0 Merge: c3638042d306399da1af14ce07fe960180d26279 7c9016913030319fcbbf0c342fae7d06ecf6f84b Author: Stephane Glondu st...@glondu.net Date: Sun Jun 26 22:50:20 2011 +0200 Merge commit 'upstream/0.1.2' -- fieldslib 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] fieldslib packaging branch, master, updated. debian/0.1.0-2-12-g6155aa1
The following commit has been merged in the master branch: commit a64cb082e6f89b8cc324f2f3e26cc214b11489ac Author: Stephane Glondu st...@glondu.net Date: Sun Jun 26 22:57:38 2011 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 2ff60ac..ffa731b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +fieldslib (0.1.2-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu glo...@debian.org Sun, 26 Jun 2011 22:57:31 +0200 + fieldslib (0.1.0-2) unstable; urgency=low * Use quilt for patch management -- fieldslib 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] fieldslib packaging branch, master, updated. debian/0.1.0-2-12-g6155aa1
The following commit has been merged in the master branch: commit 39474f8299cd93a4e13cc4f73157f6abbdf4be53 Author: Stephane Glondu st...@glondu.net Date: Sun Jun 26 22:52:41 2011 +0200 Bump versioned build-dependencies diff --git a/debian/control b/debian/control index 28fd07b..df6cdc4 100644 --- a/debian/control +++ b/debian/control @@ -7,11 +7,11 @@ Build-Depends: cdbs, debhelper (= 7), quilt, - ocaml-nox (= 3.11.1), + ocaml-nox (= 3.12), ocaml-findlib, camlp4, camlp4-extra, - libtype-conv-camlp4-dev, + libtype-conv-camlp4-dev (= 2.3.0), dh-ocaml (= 0.9) Standards-Version: 3.8.3 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/fieldslib.git -- fieldslib 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] fieldslib packaging branch, master, updated. debian/0.1.0-2-12-g6155aa1
The following commit has been merged in the master branch: commit 5d00c8ecab42bbd2992cb38f622d198c44415ccc Author: Stephane Glondu st...@glondu.net Date: Sun Jun 26 22:53:32 2011 +0200 Remove obsolete patches diff --git a/debian/patches/0001-support-for-bytecode-only-build.patch b/debian/patches/0001-support-for-bytecode-only-build.patch deleted file mode 100644 index 18073b6..000 --- a/debian/patches/0001-support-for-bytecode-only-build.patch +++ /dev/null @@ -1,74 +0,0 @@ -From: Stefano Zacchiroli z...@upsilon.cc -Date: Fri, 11 Dec 2009 10:45:33 +0100 -Subject: [PATCH] support for bytecode-only build - - Makefile |9 + - OCamlMakefile |2 +- - lib/Makefile |8 +++- - 3 files changed, 17 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index e5bd9d9..dec8f1c 100644 a/Makefile -+++ b/Makefile -@@ -3,10 +3,19 @@ all: - @cd lib $(MAKE) - @cd sample $(MAKE) - -+.PHONY: byte -+byte: -+ @cd lib $(MAKE) byte -+ @cd sample $(MAKE) -+ - .PHONY: install - install: - @cd lib $(MAKE) $@ - -+.PHONY: installbyte -+installbyte: -+ @cd lib $(MAKE) $@ -+ - .PHONY: uninstall - uninstall: - @cd lib $(MAKE) $@ -diff --git a/OCamlMakefile b/OCamlMakefile -index e9deb24..b7042bf 100644 a/OCamlMakefile -+++ b/OCamlMakefile -@@ -1216,7 +1216,7 @@ libinstall: all - $(QUIET)printf \nInstallation successful.\n - - .PHONY: libinstall-byte-code --libinstall-byte-code: all -+libinstall-byte-code: - $(QUIET)printf \nInstalling byte-code library with ocamlfind\n - $(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \ - $(filter-out $(RESULT).$(EXT_LIB) $(RESULT).cmxa, $(LIBINSTALL_FILES)) -diff --git a/lib/Makefile b/lib/Makefile -index 5fd5087..af8b13e 100644 a/lib/Makefile -+++ b/lib/Makefile -@@ -14,14 +14,20 @@ all: \ - fieldslib.cma fieldslib.cmxa \ - pa_fields_conv.cmi pa_fields_conv.cmo - -+byte: \ -+ pack-byte-code \ -+ fieldslib.cma \ -+ pa_fields_conv.cmi pa_fields_conv.cmo -+ - #toplevel-library:byte-code-library \ - # $(OCAMLC) -a -o sexplib_top.cma sexplib.cma install_printers.cmo - - LIBINSTALL_FILES = \ -- fieldslib.cmi fieldslib.cma fieldslib.cmxa $(wildcard fieldslib.a) \ -+ fieldslib.cmi fieldslib.cma $(wildcard fieldslib.cmxa) $(wildcard fieldslib.a) \ - $(wildcard fieldslib.lib) pa_fields_conv.cmi pa_fields_conv.cmo - - install: libinstall -+installbyte: libinstall-byte-code - uninstall:libuninstall - - clean:: clean-doc --- diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 1eea0ff..000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -0001-support-for-bytecode-only-build.patch -- fieldslib 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] fieldslib packaging branch, master, updated. debian/0.1.0-2-12-g6155aa1
The following commit has been merged in the master branch: commit d807d7035574bff3761136108bfb42e17702acdb Author: Stephane Glondu st...@glondu.net Date: Sun Jun 26 22:56:34 2011 +0200 Bump debhelper compat level to 8 diff --git a/debian/compat b/debian/compat index 7f8f011..45a4fb7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +8 diff --git a/debian/control b/debian/control index df6cdc4..59850dd 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Stefano Zacchiroli z...@debian.org, Build-Depends: cdbs, - debhelper (= 7), + debhelper (= 8), quilt, ocaml-nox (= 3.12), ocaml-findlib, -- fieldslib 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] fieldslib packaging branch, master, updated. debian/0.1.0-2-12-g6155aa1
The following commit has been merged in the master branch: commit afa742c4e76a19e6273a597972dacdb4d89851b8 Author: Stephane Glondu st...@glondu.net Date: Sun Jun 26 22:56:58 2011 +0200 Switch source package format to 3.0 (quilt) diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 000..c4cf480 --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1,2 @@ +abort-on-upstream-changes +unapply-patches -- fieldslib 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] fieldslib packaging branch, master, updated. debian/0.1.0-2-12-g6155aa1
The following commit has been merged in the master branch: commit ddceb7cfa1def0dcf55a31af5ccae4dcd8ae3789 Author: Stephane Glondu st...@glondu.net Date: Mon Jun 27 08:45:05 2011 +0200 Remove unneeded build-dependencies diff --git a/debian/control b/debian/control index 59850dd..821e8ed 100644 --- a/debian/control +++ b/debian/control @@ -4,9 +4,7 @@ Priority: extra Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Stefano Zacchiroli z...@debian.org, Build-Depends: - cdbs, debhelper (= 8), - quilt, ocaml-nox (= 3.12), ocaml-findlib, camlp4, -- fieldslib 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] fieldslib packaging branch, master, updated. debian/0.1.0-2-12-g6155aa1
The following commit has been merged in the master branch: commit 6d0bcaa167c866e19da3147a63ee18342b75 Author: Stephane Glondu st...@glondu.net Date: Mon Jun 27 08:45:35 2011 +0200 Bump Standards-Version to 3.9.2 (no changes) diff --git a/debian/control b/debian/control index 821e8ed..6727f47 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: camlp4-extra, libtype-conv-camlp4-dev (= 2.3.0), dh-ocaml (= 0.9) -Standards-Version: 3.8.3 +Standards-Version: 3.9.2 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/fieldslib.git Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/fieldslib.git Homepage: http://ocaml.janestreet.com/?q=node/13 -- fieldslib 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] fieldslib packaging branch, master, updated. debian/0.1.0-2-12-g6155aa1
The following commit has been merged in the master branch: commit 01437405e33ba0ee9e5f7cecd95e6e28f32d105c Author: Stephane Glondu st...@glondu.net Date: Sun Jun 26 22:56:13 2011 +0200 New debian/rules using dh with overrides diff --git a/debian/rules b/debian/rules index 1931402..0c9b2f8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,24 +1,35 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/makefile.mk -include /usr/share/cdbs/1/rules/ocaml.mk -LIB_NAME = fields -PKG_NAME = lib$(LIB_NAME)-camlp4-dev -DESTDIR = $(CURDIR)/debian/$(PKG_NAME)$(OCAML_STDLIB_DIR) -OCAMLFIND_INSTFLAGS=-destdir $(DESTDIR) +DESTDIR=$(CURDIR)/debian/libfields-camlp4-dev -ifeq ($(OCAML_HAVE_OCAMLOPT),yes) -DEB_MAKE_BUILD_TARGET = all -DEB_MAKE_INSTALL_TARGET = install OCAMLFIND_INSTFLAGS=$(OCAMLFIND_INSTFLAGS) -else -DEB_MAKE_BUILD_TARGET = byte -DEB_MAKE_INSTALL_TARGET = installbyte OCAMLFIND_INSTFLAGS=$(OCAMLFIND_INSTFLAGS) -endif +include /usr/share/ocaml/ocamlvars.mk -OCAML_DHOCAML_FLAGS := --runtime-map=$(PKG_NAME) +export OCAML_DLL_DIR +export OCAML_HAVE_OCAMLOPT +export OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR) +export OCAMLFIND_LDCONF=ignore -build/$(PKG_NAME):: - mkdir -p $(DESTDIR) +%: + dh $@ --with ocaml +.PHONY: override_dh_auto_configure +override_dh_auto_configure: + ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --docdir /usr/share/doc/libfields-camlp4-dev + +.PHONY: override_dh_auto_build +override_dh_auto_build: + ocaml setup.ml -build + ocaml setup.ml -doc + +.PHONY: override_dh_auto_test +override_dh_auto_test: + ocaml setup.ml -test + +.PHONY: override_dh_auto_install +override_dh_auto_install: + mkdir -p '$(OCAMLFIND_DESTDIR)' + ocaml setup.ml -install + +.PHONY: override_dh_auto_clean +override_dh_auto_clean: + ocaml setup.ml -distclean -- fieldslib 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] fieldslib packaging branch, master, updated. debian/0.1.0-2-12-g6155aa1
The following commit has been merged in the master branch: commit 6155aa1e4d079f1f4a9eb1478a1b9aa93edfcef1 Author: Stephane Glondu st...@glondu.net Date: Mon Jun 27 08:50:29 2011 +0200 Update changelog diff --git a/debian/changelog b/debian/changelog index ffa731b..979b941 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,11 @@ fieldslib (0.1.2-1) UNRELEASED; urgency=low * New upstream release +- remove obsolete patch + * Rewrite debian/rules using dh with overrides + * Switch source package format to 3.0 (quilt) + * Bump Standards-Version to 3.9.2 + * Bump debhelper compat level to 8 -- Stéphane Glondu glo...@debian.org Sun, 26 Jun 2011 22:57:31 +0200 -- fieldslib 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
