[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.11.1-5-6-g86467cd

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 86467cd89eb5f337f90cfed336731ed9802b2c6c
Author: Ralf Treinen <treinen at free.fr>
Date:   Sat Jan 2 13:42:54 2010 +0100

    ocaml-mode: depnds on emacs23 now

diff --git a/debian/changelog b/debian/changelog
index 6825370..80e56cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 ocaml (3.11.1-6) UNRELEASED; urgency=low
 
+  [ Mehdi Dogguy ]
   * camlp4-extra:
     - Add cma files back into the package (Requested by users).
     - Don't install a manpage for camlp4boot (which is not installed).
@@ -8,7 +9,10 @@ ocaml (3.11.1-6) UNRELEASED; urgency=low
   * debian/control:
     - Make camlp4-extra depend on ocaml-base-nox
 
- -- Mehdi Dogguy <mehdi at debian.org>  Wed, 16 Dec 2009 13:21:56 +0100
+  [ Ralf Treinen ]
+  * debian/control.in: bump dependency of ocaml-mode on emacs22 to emacs23.
+
+ -- Ralf Treinen <treinen at debian.org>  Sat, 02 Jan 2010 13:42:30 +0100
 
 ocaml (3.11.1-5) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index fd329db..d7cdcbc 100644
--- a/debian/control
+++ b/debian/control
@@ -278,7 +278,7 @@ Description: OCaml interpreter and standard libraries
 Package: ocaml-mode
 Architecture: all
 Depends:
- emacs22 | emacsen,
+ emacs23 | emacsen,
  ${shlibs:Depends},
  ${misc:Depends}
 Suggests: ocaml
diff --git a/debian/control.in b/debian/control.in
index 744bfd5..ab01ec5 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -278,7 +278,7 @@ Description: OCaml interpreter and standard libraries
 Package: ocaml-mode
 Architecture: all
 Depends:
- emacs22 | emacsen,
+ emacs23 | emacsen,
  ${shlibs:Depends},
  ${misc:Depends}
 Suggests: ocaml

-- 
OCaml packaging