[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, 3.11/master, updated. debian/3.10.2-3-59-g4900cdc

[Stephane Glondu]

The following commit has been merged in the 3.11/master branch:
commit 4900cdc4d4cf44f86a11b0b443f6e3fe8b8f6446
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Nov 3 23:11:29 2008 +0100

    Remove dependency to gcc-4.2 on arm

diff --git a/debian/changelog b/debian/changelog
index 9239f7d..aa15bf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ocaml (3.11.0~beta1-1) UNRELEASED; urgency=low
     - not-native-no-aspp.dpatch removed (thanks to upstream bugfix)
     - all other patches updated
     - manpages.dpatch and ocamldoc.dpatch added
+    - dependency to gcc-4.2 on arm removed
   * Switching packaging to git (from svn)
   * Bump debhelper compatibility level to 7, and use debian/clean feature
     of dh_clean
@@ -22,7 +23,7 @@ ocaml (3.11.0~beta1-1) UNRELEASED; urgency=low
     - ocaml-md5sums (therefore also disable its usage at the end of the
       build process)
 
- -- Stephane Glondu <steph at glondu.net>  Sun, 02 Nov 2008 12:56:34 +0100
+ -- Stephane Glondu <steph at glondu.net>  Mon, 03 Nov 2008 23:10:06 +0100
 
 ocaml (3.10.2-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f69cb00..e17377c 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Uploaders:
  Sylvain Le Gall <gildor at debian.org>,
  Ralf Treinen <treinen at debian.org>,
  Stephane Glondu <steph at glondu.net>
-Build-Depends: debhelper (>= 7), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils, gcc-4.2 [arm]
+Build-Depends: debhelper (>= 7), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml.git
@@ -18,7 +18,7 @@ Homepage: http://caml.inria.fr/
 
 Package: ocaml-nox
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libncurses5-dev, ocaml-base-nox (=${binary:Version}), ocaml-interp (=${binary:Version}), gcc [!arm], gcc-4.2 [arm], binutils
+Depends: ${shlibs:Depends}, ${misc:Depends}, libncurses5-dev, ocaml-base-nox (=${binary:Version}), ocaml-interp (=${binary:Version}), gcc, binutils
 Suggests: ocaml-doc, libgdbm-dev, tuareg-mode | ocaml-mode
 Recommends: camlp4, ledit, file
 Provides: ocaml-nox-${F:OCamlABI}, ${F:BestProvides}, libnums-ocaml-dev
@@ -144,7 +144,7 @@ Description: Runtime system for OCaml bytecode executables
 
 Package: ocaml-native-compilers
 Architecture: amd64 hurd-i386 i386 kfreebsd-i386 powerpc sparc
-Depends: ocaml-nox (= ${binary:Version}), gcc [!arm], gcc-4.2 [arm], binutils, ${shlibs:Depends}, ${misc:Depends}
+Depends: ocaml-nox (= ${binary:Version}), gcc, binutils, ${shlibs:Depends}, ${misc:Depends}
 Provides: ocaml-best-compilers
 Replaces: ocaml-nox (<= 3.09.2-3)
 Description: Native code compilers of the OCaml suite (the .opt ones)
diff --git a/debian/rules b/debian/rules
index 58dfded..37aa1ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,9 +35,6 @@ endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
-ifeq (arm,$(DEB_BUILD_ARCH))
-CFG_CC_FLAGS = -cc gcc-4.2
-endif
 
 abi-sed:
 	for t in `find debian/ -name \*.in | grep -v debian/control.in`; do \
@@ -74,7 +71,7 @@ debian/$(SRCTARBALL):
 
 config-stamp: pre-config patch-stamp abi-sed
 	dh_testdir
-	./configure --with-pthread -prefix /usr $(CFG_CC_FLAGS)		\
+	./configure --with-pthread -prefix /usr				\
 		-libdir /usr/lib/ocaml/$(OCAMLABI)			\
 		-mandir /usr/share/man					\
 		-tkdefs "-I/usr/include/tcl8.4"				\

-- 
OCaml packaging