* debian/control: Add a dependency on emacsen-common, because this is needed

  to install the caml emacs mode in ocaml-nox (Closes: #312618).
* (cosmetic) fix patch header in asmcomp_amd64_emit.mlp.dpatch

diff --git a/debian/changelog b/debian/changelog
index 228baddafab53dfe4fa9bc9318ada63f1ab3a4e0..606046c7d5260dc264c43196f713c146cd195cd1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,15 @@
 ocaml (3.08.3-3+SVN) UNRELEASED; urgency=low
 
+  Changes by Julien Cristau:
   * Create directories in /usr/local/lib with proper permissions in
     ocaml-base-nox's postinst, and remove them if empty in prerm
     (Closes: #270925).
   * Add patch from upstream bugfix branch by Xavier Leroy to fix code
     generation on amd64 (reported by John Skaller).
+  * debian/control: Add a dependency on emacsen-common, because this is needed
+    to install the caml emacs mode in ocaml-nox (Closes: #312618).
 
- -- Julien Cristau <julien.cristau@ens-lyon.org>  Tue, 14 Jun 2005 03:17:55 +0200
+ -- Julien Cristau <julien.cristau@ens-lyon.org>  Mon, 20 Jun 2005 19:58:32 +0200
 
 ocaml (3.08.3-3) unstable; urgency=medium
 

diff --git a/debian/control b/debian/control
index 935e112ce0d0d4952756febd59959179e861de1d..6621ce5ae400948dd3c53fdc9ab7b370ce30903a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.6.1
 
 Package: ocaml-nox
 Architecture: any
-Depends: libncurses5-dev, ocaml-base-nox (=${Source-Version}), ocaml-base-nox-3.08.3, ocaml-interp-3.08.3
+Depends: libncurses5-dev, ocaml-base-nox (=${Source-Version}), ocaml-base-nox-3.08.3, ocaml-interp-3.08.3, emacsen-common
 Suggests: ocaml-doc, libgdbm-dev, emacsen
 Recommends: ledit, file
 Provides: ocaml-nox-3.08.3 ${F:BestProvides}, libnums-ocaml-dev

diff --git a/debian/patches/asmcomp_amd64_emit.mlp.dpatch b/debian/patches/asmcomp_amd64_emit.mlp.dpatch
index a9e7cea40f953d3e96587db3b280d1596d139f60..310c2f9c0e7126f1a5e8ab54e96a30e43d2b70a8 100755 (executable)
--- a/debian/patches/asmcomp_amd64_emit.mlp.dpatch
+++ b/debian/patches/asmcomp_amd64_emit.mlp.dpatch
@@ -5,7 +5,7 @@
 ## DP: Upstream fix for code generation bug on amd64 (PR#3640)
 
 @DPATCH@
-diff -urNad ocaml-3.08.3/asmcomp/amd64/emit.mlp /tmp/dpep.7xGPae/ocaml-3.08.3/asmcomp/amd64/emit.mlp
+diff -urNad ocaml-3.08.3.orig/asmcomp/amd64/emit.mlp ocaml-3.08.3/asmcomp/amd64/emit.mlp
 --- ocaml-3.08.3/asmcomp/amd64/emit.mlp        2004-07-01 18:09:03.000000000 +0200
 +++ /tmp/dpep.7xGPae/ocaml-3.08.3/asmcomp/amd64/emit.mlp       2005-06-14 03:08:25.481518269 +0200
 @@ -10,7 +10,7 @@