[Pkg-ocaml-maint-commits] r4381 - in /trunk/packages/ocamlgsl/trunk/debian: changelog control control.in libocamlgsl-ocaml-dev.dirs libocamlgsl-ocaml-dev.doc-base libocamlgsl-ocaml-dev.install libocamlgsl-ocaml-dev.install.in libocamlgsl-ocaml.dirs.in rules
gildor at users.alioth.debian.org
gildor at users.alioth.debian.org
Wed Sep 5 20:38:00 UTC 2007
Author: gildor
Date: Wed Sep 5 20:38:00 2007
New Revision: 4381
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4381
Log:
* Use ocaml.mk
* Move doc to html/api
* Rebuild for ocaml 3.10.0
* New upstream
Added:
trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml-dev.install.in
- copied, changed from r4245, trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml-dev.install
trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml.dirs.in
Removed:
trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml-dev.dirs
trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml-dev.doc-base
trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml-dev.install
Modified:
trunk/packages/ocamlgsl/trunk/debian/changelog
trunk/packages/ocamlgsl/trunk/debian/control
trunk/packages/ocamlgsl/trunk/debian/control.in
trunk/packages/ocamlgsl/trunk/debian/rules
Modified: trunk/packages/ocamlgsl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/changelog?rev=4381&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/changelog (original)
+++ trunk/packages/ocamlgsl/trunk/debian/changelog Wed Sep 5 20:38:00 2007
@@ -1,8 +1,14 @@
-ocamlgsl (0.5.2-3) unstable; urgency=low
+ocamlgsl (0.6.0-1) UNRELEASED; urgency=low
+ * New upstream release
* Change email address to gildor at debian.org everywhere
+ * Rebuild for ocaml 3.10.0
+ * Move documentation to html/api
+ * Use more debian/*.in file to take advantage of substitution of
+ OCamlDllDir/OCamlStdlibDir
+ * Use CDBS ocaml.mk
- -- Sylvain Le Gall <gildor at debian.org> Thu, 21 Jun 2007 23:13:00 +0100
+ -- Sylvain Le Gall <gildor at debian.org> Wed, 05 Sep 2007 22:09:30 +0200
ocamlgsl (0.5.2-2) unstable; urgency=low
Modified: trunk/packages/ocamlgsl/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/control?rev=4381&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/control (original)
+++ trunk/packages/ocamlgsl/trunk/debian/control Wed Sep 5 20:38:00 2007
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2), ocaml-findlib, libgsl0-dev, chrpath, gawk, dpkg-dev (>= 1.13.19)
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8), ocaml-findlib (>= 1.1.2pl1-4), libgsl0-dev, chrpath, gawk, dpkg-dev (>= 1.13.19), camlp4 (>= 3.10.0)
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlgsl
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/
Modified: trunk/packages/ocamlgsl/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/control.in?rev=4381&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/control.in (original)
+++ trunk/packages/ocamlgsl/trunk/debian/control.in Wed Sep 5 20:38:00 2007
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: @cdbs@, ocaml-nox (>= 3.09.2), ocaml-findlib, libgsl0-dev, chrpath, gawk, dpkg-dev (>= 1.13.19)
+Build-Depends: @cdbs@, ocaml-findlib (>= 1.1.2pl1-4), libgsl0-dev, chrpath, gawk, dpkg-dev (>= 1.13.19), camlp4 (>= 3.10.0)
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlgsl
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/
Copied: trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml-dev.install.in (from r4245, trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml-dev.install)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml-dev.install.in?rev=4381&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml-dev.install (original)
+++ trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml-dev.install.in Wed Sep 5 20:38:00 2007
@@ -1,1 +1,3 @@
-doc/* /usr/share/doc/libocamlgsl-ocaml-dev/html
+doc/* /usr/share/doc/libocamlgsl-ocaml-dev/html/api/
+*.mli @OCamlStdlibDir@/gsl/
+META @OCamlStdlibDir@/gsl/
Added: trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml.dirs.in?rev=4381&op=file
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml.dirs.in (added)
+++ trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml.dirs.in Wed Sep 5 20:38:00 2007
@@ -1,0 +1,1 @@
+ at OCamlDllDir@
Modified: trunk/packages/ocamlgsl/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/rules?rev=4381&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/rules (original)
+++ trunk/packages/ocamlgsl/trunk/debian/rules Wed Sep 5 20:38:00 2007
@@ -23,13 +23,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/class/makefile.mk
-
-# Taken from ocaml.mk
-OCAMLABI = $(shell ocamlc -version)
-DEB_DH_GENCONTROL_ARGS += -- -VF:OCamlABI="$(OCAMLABI)"
-OCAML_HAVE_OCAMLOPT := $(shell if test -x /usr/bin/ocamlopt ; then echo "yes" ; else echo "no" ; fi)
-OCAML_STDLIB_DIR := $(shell /usr/bin/ocamlc -where)
-
+include /usr/share/cdbs/1/class/ocaml.mk
DEB_MAKE_CLEAN_TARGET := clean
ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
@@ -48,11 +42,21 @@
DEB_MAKE_INSTALL_TARGET += DESTDIR="$(DESTDIR_DEV)"
+CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-8),$(CDBS_BUILD_DEPENDS))
+
+build/libocamlgsl-ocaml-dev::
+ i=libocamlgsl-ocaml-dev; \
+ sed -e "s/@PACKAGE@/$$i/g" \
+ /usr/share/cdbs/1/class/ocaml-docbase-template.txt \
+ > debian/$$i.doc-base.ocamldoc-apiref
+
+clean::
+ -$(RM) "$(CURDIR)/debian/libocamlgsl-ocaml-dev.doc-base.ocamldoc-apiref"
+ -$(RM) "$(CURDIR)/debian/libocamlgsl-ocaml-dev.install"
+ -$(RM) "$(CURDIR)/debian/libocamlgsl-ocaml.dirs"
+
install/libocamlgsl-ocaml-dev::
- cp $(CURDIR)/META \
- $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/gsl/META
- $(RM) -r $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/stublibs
- mkdir -p $(DESTDIR)/$(OCAML_STDLIB_DIR)/stublibs
+ $(RM) -r $(DESTDIR_DEV)/$(OCAML_DLL_DIR)
mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/gsl/*.so \
- $(DESTDIR)/$(OCAML_STDLIB_DIR)/stublibs/
+ $(DESTDIR)/$(OCAML_DLL_DIR)
chrpath -d $(DESTDIR)/$(OCAML_STDLIB_DIR)/stublibs/*.so
More information about the Pkg-ocaml-maint-commits
mailing list