[Pkg-ocaml-maint-commits] [SCM] mingw32-ocaml packaging branch, master, updated. debian/3.12.0+debian1-1-g935dcf5

[Romain Beauxis]

The following commit has been merged in the master branch:
commit 935dcf575405f1c4abb5ae278cd07d5c07573134
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Mon Apr 4 14:19:51 2011 -0500

    Prepared new upload..

diff --git a/debian/Makefile-mingw32.in b/debian/Makefile-mingw32.in
index cd72ad2..9348e91 100644
--- a/debian/Makefile-mingw32.in
+++ b/debian/Makefile-mingw32.in
@@ -66,7 +66,7 @@ EXTRALIBS=
 CCOMPTYPE=cc
 TOOLCHAIN=cc
 CMXS=cmxs
-FLEXLINK=@flexdir@/flexlink -chain mingw
+FLEXLINK=flexlink -chain mingw
 MKEXE=$(FLEXLINK) -exe
 MKDLL=$(FLEXLINK)
 MKMAINDLL=$(FLEXLINK) -maindll
diff --git a/debian/changelog b/debian/changelog
index c5f161e..6349c71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mingw32-ocaml (3.12.0+debian2) unstable; urgency=low
+
+  * Upload to unstable.
+  * Fixed flexlink path.
+  * Switched to gcc-mingw32.
+
+ -- Romain Beauxis <toots at rastageeks.org>  Mon, 04 Apr 2011 11:36:30 -0500
+
 mingw32-ocaml (3.12.0+debian1) experimental; urgency=low
 
   * Updated package to 3.12.0. 
diff --git a/debian/control b/debian/control
index 825b9b4..5d1255e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Romain Beauxis <toots at rastageeks.org>
-Build-Depends: cdbs, debhelper (>= 7), quilt, mingw32, gcc-multilib [amd64 kfreebsd-amd64], 
-               ocaml-nox, camlp4, m4
+Build-Depends: cdbs, debhelper (>= 7), quilt, gcc-mingw32, gcc-multilib [amd64 kfreebsd-amd64], 
+               mingw32-runtime, ocaml-nox, camlp4, m4
 Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mingw32-ocaml.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/mingw32-ocaml.git
@@ -16,7 +16,8 @@ Depends:
  ${misc:Depends},
  ocaml-nox,
  ocaml-findlib,
- mingw32
+ gcc-mingw32,
+ mingw32-runtime
 Description: OCaml cross-compiler based on mingw32
  Objective Caml (OCaml) is an implementation of the ML language, based on
  the Caml Light dialect extended with a complete class-based object system
diff --git a/debian/rules b/debian/rules
index 2ee667c..286addd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -100,7 +100,9 @@ stamp-build-mingw32-ocaml:
 	    make -C otherlibs/$$i allopt; \
 	done
 	# Build camlp4
-	cd $(DEB_BUILDDIR)/$(OCAML_DIR) && make camlp4opt
+	cd $(DEB_BUILDDIR)/$(OCAML_DIR) && \
+	  PATH=$(CURDIR)/$(DEB_BUILDDIR)/$(FLEXDLL_DIR):$(PATH) \
+	  make camlp4opt
 	touch stamp-build-mingw32-ocaml
 
 stamp-build-findlib:

-- 
mingw32-ocaml packaging