[Pkg-ocaml-maint-commits] r3530 - in /trunk/packages/ocamlgsl/trunk/debian: changelog control control.in rules watch

[gildor at users.alioth.debian.org]

Author: gildor
Date: Sun Jan 21 18:07:29 2007
New Revision: 3530

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3530
Log:
* Revert changes of build system to be able to upload it to etch
-- 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=3530&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/changelog (original)
+++ trunk/packages/ocamlgsl/trunk/debian/changelog Sun Jan 21 18:07:29 2007
@@ -1,3 +1,9 @@
+ocamlgsl (0.5.2-2) unstable; urgency=low
+
+  * Revert changes on the build system
+
+ -- Sylvain Le Gall <gildor at debian.org>  Sun, 21 Jan 2007 18:06:07 +0100
+
 ocamlgsl (0.5.2-1) unstable; urgency=low
 
   * New upstream release:

Modified: trunk/packages/ocamlgsl/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/control?rev=3530&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/control (original)
+++ trunk/packages/ocamlgsl/trunk/debian/control Sun Jan 21 18:07:29 2007
@@ -2,8 +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-7), 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), 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=3530&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/control.in (original)
+++ trunk/packages/ocamlgsl/trunk/debian/control.in Sun Jan 21 18:07:29 2007
@@ -2,8 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: @cdbs@, ocaml-findlib, 
- libgsl0-dev, chrpath, gawk, dpkg-dev (>= 1.13.19)
+Build-Depends: @cdbs@, ocaml-nox (>= 3.09.2), 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=3530&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/rules (original)
+++ trunk/packages/ocamlgsl/trunk/debian/rules Sun Jan 21 18:07:29 2007
@@ -23,7 +23,22 @@
 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)
+
+
+DEB_MAKE_CLEAN_TARGET    := clean
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+DEB_MAKE_BUILD_TARGET    := all-opt
+DEB_MAKE_INSTALL_TARGET  := install-opt
+else
+DEB_MAKE_BUILD_TARGET    := all-byte
+DEB_MAKE_INSTALL_TARGET  := install-byte
+endif
 
 PACKAGE_DEV := libocamlgsl-ocaml-dev
 DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
@@ -31,18 +46,7 @@
 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
-else
-DEB_MAKE_BUILD_TARGET    := all-byte
-DEB_MAKE_INSTALL_TARGET  := install-byte
-endif
-DEB_MAKE_INSTALL_TARGET  += DESTDIR="$(DESTDIR_DEV)"
-
-CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.09.2-7),$(CDBS_BUILD_DEPENDS))
+DEB_MAKE_INSTALL_TARGET += DESTDIR="$(DESTDIR_DEV)"
 
 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=3530&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/watch (original)
+++ trunk/packages/ocamlgsl/trunk/debian/watch Sun Jan 21 18:07:29 2007
@@ -1,2 +1,2 @@
-version=3
+version=2
 http://oandrieu.nerim.net/ocaml/gsl/ocamlgsl-([0-9].*)\.tar\.gz