[Pkg-ocaml-maint-commits] r3507 - in
/trunk/packages/ocamlgsl/trunk/debian: changelog control
control.in rules watch
gildor at users.alioth.debian.org
gildor at users.alioth.debian.org
Sun Jan 7 23:06:16 CET 2007
Author: gildor
Date: Sun Jan 7 23:06:15 2007
New Revision: 3507
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3507
Log:
* Upgrade debian/watch version to 3,
* Use ocaml.ml
-- SLG
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
trunk/packages/ocamlgsl/trunk/debian/watch
Modified: trunk/packages/ocamlgsl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/changelog?rev=3507&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/changelog (original)
+++ trunk/packages/ocamlgsl/trunk/debian/changelog Sun Jan 7 23:06:15 2007
@@ -1,3 +1,9 @@
+ocamlgsl (0.5.1-4) UNRELEASED; urgency=low
+
+ * Upgrade debian/watch version to 3,
+
+ -- Sylvain Le Gall <gildor at debian.org> Thu, 9 Nov 2006 23:39:55 +0100
+
ocamlgsl (0.5.1-3) unstable; urgency=low
* Correct a typo OCAML_HAVE_OPT -> OCAML_HAVE_OCAMLOPT
Modified: trunk/packages/ocamlgsl/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/control?rev=3507&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/control (original)
+++ trunk/packages/ocamlgsl/trunk/debian/control Sun Jan 7 23:06:15 2007
@@ -2,7 +2,8 @@
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.09.2-7), ocaml-findlib,
+ libgsl0-dev, chrpath, gawk, dpkg-dev (>= 1.13.19)
Standards-Version: 3.7.2
XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlgsl
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=3507&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/control.in (original)
+++ trunk/packages/ocamlgsl/trunk/debian/control.in Sun Jan 7 23:06:15 2007
@@ -2,7 +2,8 @@
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,
+ libgsl0-dev, chrpath, gawk, dpkg-dev (>= 1.13.19)
Standards-Version: 3.7.2
XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlgsl
Modified: trunk/packages/ocamlgsl/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/rules?rev=3507&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/rules (original)
+++ trunk/packages/ocamlgsl/trunk/debian/rules Sun Jan 7 23:06:15 2007
@@ -23,15 +23,16 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/class/ocaml.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)
+PACKAGE_DEV := libocamlgsl-ocaml-dev
+DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
+PACKAGE := libocamlgsl-ocaml
+DESTDIR := $(CURDIR)/debian/$(PACKAGE)
DEB_MAKE_CLEAN_TARGET := clean
+
ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
DEB_MAKE_BUILD_TARGET := all-opt
DEB_MAKE_INSTALL_TARGET := install-opt
@@ -39,14 +40,9 @@
DEB_MAKE_BUILD_TARGET := all-byte
DEB_MAKE_INSTALL_TARGET := install-byte
endif
+DEB_MAKE_INSTALL_TARGET += DESTDIR="$(DESTDIR_DEV)"
-PACKAGE_DEV := libocamlgsl-ocaml-dev
-DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
-
-PACKAGE := libocamlgsl-ocaml
-DESTDIR := $(CURDIR)/debian/$(PACKAGE)
-
-DEB_MAKE_INSTALL_TARGET += DESTDIR="$(DESTDIR_DEV)"
+CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.09.2-7),$(CDBS_BUILD_DEPENDS))
install/libocamlgsl-ocaml-dev::
cp $(CURDIR)/META \
Modified: trunk/packages/ocamlgsl/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/watch?rev=3507&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/watch (original)
+++ trunk/packages/ocamlgsl/trunk/debian/watch Sun Jan 7 23:06:15 2007
@@ -1,2 +1,2 @@
-version=2
+version=3
http://oandrieu.nerim.net/ocaml/gsl/ocamlgsl-([0-9].*)\.tar\.gz
More information about the Pkg-ocaml-maint-commits
mailing list