[Pkg-ocaml-maint-commits] r6395 - in /trunk/packages/felix/trunk/debian: changelog control rules

[dogguy-guest at users.alioth.debian.org]

Author: dogguy-guest
Date: Wed Jun 24 20:46:14 2009
New Revision: 6395

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=6395
Log:
Remove usage of old Ocaml's Standard library location and add dh-ocaml as a build-dep

Modified:
    trunk/packages/felix/trunk/debian/changelog
    trunk/packages/felix/trunk/debian/control
    trunk/packages/felix/trunk/debian/rules

Modified: trunk/packages/felix/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/felix/trunk/debian/changelog?rev=6395&op=diff
==============================================================================
--- trunk/packages/felix/trunk/debian/changelog (original)
+++ trunk/packages/felix/trunk/debian/changelog Wed Jun 24 20:46:14 2009
@@ -1,8 +1,13 @@
 felix (1.1.3-5) UNRELEASED; urgency=low
 
+  [ Sylvain Le Gall ]
   * NOT RELEASED YET
 
- -- Sylvain Le Gall <gildor at debian.org>  Thu, 29 May 2008 08:37:53 +0200
+  [ Mehdi Dogguy ]
+  * Use new Ocaml's standard library location
+  * Add dh-ocaml as a build-dependency
+
+ -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Wed, 24 Jun 2009 22:45:43 +0200
 
 felix (1.1.3-4) unstable; urgency=low
 

Modified: trunk/packages/felix/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/felix/trunk/debian/control?rev=6395&op=diff
==============================================================================
--- trunk/packages/felix/trunk/debian/control (original)
+++ trunk/packages/felix/trunk/debian/control Wed Jun 24 20:46:14 2009
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Mike Furr <mfurr at debian.org>
 Uploaders: John Skaller <skaller at users.sf.net>, Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>= 4.0.0), python (>=2.0), ocaml-nox (>= 3.10.0), ocaml-best-compilers, gnuplot (>=4.0), man2html (>=1.5), sed (>=4.1), dpatch, libsdl1.2-dev, freeglut3-dev, libglu1-mesa-dev, doxygen, libgmp3-dev, libgsl0-dev
+Build-Depends: debhelper (>= 4.0.0), python (>=2.0), ocaml-nox (>= 3.10.0), ocaml-best-compilers, gnuplot (>=4.0), man2html (>=1.5), sed (>=4.1), dpatch, libsdl1.2-dev, freeglut3-dev, libglu1-mesa-dev, doxygen, libgmp3-dev, libgsl0-dev, dh-ocaml (>= 0.4.1)
 Standards-Version: 3.7.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/felix/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/felix/trunk/

Modified: trunk/packages/felix/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/felix/trunk/debian/rules?rev=6395&op=diff
==============================================================================
--- trunk/packages/felix/trunk/debian/rules (original)
+++ trunk/packages/felix/trunk/debian/rules Wed Jun 24 20:46:14 2009
@@ -17,10 +17,11 @@
 
 PACKAGE=felix
 include /usr/share/dpatch/dpatch.make
+include /usr/share/ocaml/ocamlvars.mk
 OCAMLABI = $(shell ocamlc -version)
 BYTECODE = $(shell [ -x /usr/bin/ocamlopt ] || echo yes)
 OCAMLRUN = $(if $(BYTECODE),ocaml-base-nox-$(OCAMLABI))
-OCAMLGCC = $(shell sed -n 's/NATIVECC=//p' /usr/lib/ocaml/$(OCAMLABI)/Makefile.config)
+OCAMLGCC = $(shell sed -n 's/NATIVECC=//p' $(OCAML_STDLIB_DIR)/Makefile.config)
 OCAMLGXX = $(subst cc,++,$(OCAMLGCC))
 
 .PHONY: get-orig-source