Cleanup and preparing the upload.

diff --git a/debian/changelog b/debian/changelog
index d6c794ee9b1ab7421372ca0d133c478ff649e1f4..4c0526b0398c25a8a4939df26404f46397c307c4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,15 +7,18 @@ ocaml (3.09.0-4) unstable; urgency=low
     considers this port dead (see bug#342704).
 
   [ Samuel Mimram ]
-  * Added for_pack_static.dpatch (from CVS) to correct a bug when linking.
+  * Added for_pack_static.dpatch (from CVS) to correct a bug when linking,
+    disabled for now though.
   * Added myself to uploaders.
 
   [ Julien Cristau ]
-  * Disable for_pack_static.dpatch for now, as it breaks the ABI.
   * Install the list of architectures with native compilers in the ocaml-nox
     package.
 
- -- Julien Cristau <julien.cristau@ens-lyon.org>  Mon, 19 Dec 2005 14:03:50 +0100
+  [ Sven Luther ]
+  * This version should make it into testing, so let's (Closes: #338435).
+
+ -- Sven Luther <luther@debian.org>  Mon, 19 Dec 2005 13:36:31 +0000
 
 ocaml (3.09.0-3) unstable; urgency=low
 

diff --git a/debian/control.in b/debian/control.in
index 6aa334f315166ec147f346ca79bd736501308d6a..d68ab134ce7a16fc713581fb35635b286de187ac 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -95,7 +95,7 @@ Description: Runtime system for ocaml bytecode executables
  you do not require any graphical capilities for your runtime.
 
 Package: ocaml-native-compilers
-Architecture: @native-archs@
+Architecture: #OcamlNativeArchs#
 Depends: ocaml-nox (= ${Source-Version}), ocaml-nox-${F:OCamlABI}, gcc, binutils, ${shlibs:Depends}
 Provides: ocaml-best-compilers
 Description: Native code compilers of the ocaml suite (the .opt ones)

diff --git a/debian/rules b/debian/rules
index c5a0cd9a73339c04371bb03d1a044b662f8e7958..71a106108f5b8a4006d1bd9e444dcd698b58ad22 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,7 @@ abi-sed:
 # generate ocaml-native-compilers' Architecture field
 # should never be called automatically
 debian/control:
-       sed -e 's/@native-archs@/$(NATIVE_ARCHS)/g' debian/control.in > $@
+       sed -e 's/#OcamlNativeArchs#/$(NATIVE_ARCHS)/g' debian/control.in > $@
 
 
 config-stamp: configure abi-sed