[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.11.0-3-10-gfd1fa81

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 118be37f682309a141ae3ad96e93041a35de6d80
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Feb 20 09:49:06 2009 +0100

    Update control and control.in and fix generation of control

diff --git a/debian/control b/debian/control
index 75976e8..6ffc60a 100644
--- a/debian/control
+++ b/debian/control
@@ -152,7 +152,7 @@ Description: Runtime system for OCaml bytecode executables
  you do not require any graphical capabilities for your runtime.
 
 Package: ocaml-native-compilers
-Architecture: amd64 hurd-i386 i386 kfreebsd-i386 powerpc sparc
+Architecture: amd64 hurd-i386 i386 kfreebsd-i386 lpia powerpc sparc
 Depends: ocaml-nox (= ${binary:Version}), gcc, binutils, ${shlibs:Depends}, ${misc:Depends}
 Provides: ocaml-best-compilers
 Replaces: ocaml-nox (<= 3.09.2-3)
diff --git a/debian/control.in b/debian/control.in
index 23a1193..07c62ff 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,14 +3,23 @@ Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:
- Sven Luther <luther at debian.org>,
  Stefano Zacchiroli <zack at debian.org>,
  Samuel Mimram <smimram at debian.org>,
  Sylvain Le Gall <gildor at debian.org>,
  Ralf Treinen <treinen at debian.org>,
  Stephane Glondu <steph at glondu.net>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils
+Build-Depends:
+ debhelper (>= 7),
+ tcl8.4-dev,
+ tk8.4-dev,
+ libncurses5-dev,
+ libgdbm-dev,
+ dpatch,
+ bzip2,
+ docbook-xml,
+ docbook-utils,
+ dh-ocaml (>= 0.2)
 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
@@ -89,7 +98,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ocaml-base (= ${binary:Version}), ocaml-nox (=${binary:Version}), libx11-dev
 Suggests: tcl8.4-dev, tk8.4-dev
 Provides: ocaml-${F:OCamlABI}
-Replaces: ocaml-nox (<< 3.10.0-12)
+Replaces: ocaml-nox (<< 3.11.0-2)
 Description: ML language implementation with a class-based object system
  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 1c131b2..7e25b09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,7 +55,7 @@ ocamlinit-stamp: debian/$(SRCTARBALL)
 # Generate ocaml-native-compilers' Architecture field.
 # Should never be called automatically.
 debian/control:
-	sed -e 's/@OCamlNativeArchs@/$(NATIVE_ARCHS)/g' debian/control.in > $@
+	sed -e 's/@OCamlNativeArchs@/$(OCAML_NATIVE_ARCHS)/g' debian/control.in > $@
 
 pre-config-stamp: debian/$(SRCTARBALL)
 	chmod +x debian/gen_modules.pl

-- 
OCaml packaging