Update control and control.in and fix generation of control

diff --git a/debian/control b/debian/control
index 75976e85da869062aa93bb1ea4ff7851ce0a430e..6ffc60a275113e0ec1dc7898272bad47c7b37fea 100644 (file)
--- 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 23a1193dc8e32c7d86b170e9150944e64386b015..07c62ff62e2dd82d64c6af49d3ec20f913f93226 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,14 +3,23 @@ Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
 Uploaders:
- Sven Luther <luther@debian.org>,
  Stefano Zacchiroli <zack@debian.org>,
  Samuel Mimram <smimram@debian.org>,
  Sylvain Le Gall <gildor@debian.org>,
  Ralf Treinen <treinen@debian.org>,
  Stephane Glondu <steph@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 1c131b2e57a18c22fd8ac6aed48ec7199e1a609b..7e25b0943282fece41f232739e96341739f13847 100755 (executable)
--- 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