Various updates

diff --git a/debian/camlp4-extra.dirs.in b/debian/camlp4-extra.dirs.in
deleted file mode 100644 (file)
index eb57f50..0000000
--- a/debian/camlp4-extra.dirs.in
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-@OCamlStdlibDir@/camlp4

diff --git a/debian/changelog b/debian/changelog
index b15630f8897e127f1ab0d77a6e0f147031c06868..1c4a14edef1b931684051e386a81bad66ce16f0c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 ocaml (3.11.1-3) UNRELEASED; urgency=low
 
+  [ Mehdi Dogguy ]
   * Add two tools:
     - ocamlbyteinfo to read content of bytecode binaries
     - ocamlplugininfo to read content of shared object files (.cmxs)
@@ -10,6 +11,14 @@ ocaml (3.11.1-3) UNRELEASED; urgency=low
   * Add myself to Uploaders and update Stéphane's address
   * Remove DMUA
 
+  [ Stéphane Glondu ]
+  * Add build-dependency to autotools-dev (for up-to-date config.*)
+  * Maintainer scripts:
+    - explicitly use set -e
+    - remove references to ocaml-md5sums, as its jobs is handled by
+      dh_ocaml, now
+  * Remove all debian/*.dirs* files to avoid empty directories
+
  -- Mehdi Dogguy <mehdi@debian.org>  Tue, 21 Jul 2009 17:09:31 +0200
 
 ocaml (3.11.1-2) unstable; urgency=low

diff --git a/debian/control b/debian/control
index 5ca587f6a3131bcb1064efc41e7671aa505b6204..7b8441322bf3145c3a76c6deb9ce52536202760f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Uploaders:
  Mehdi Dogguy <mehdi@debian.org>
 Build-Depends:
  debhelper (>= 7),
+ autotools-dev,
  tcl8.4-dev,
  tk8.4-dev,
  libncurses5-dev,
@@ -34,12 +35,12 @@ Depends:
  gcc,
  binutils
 Provides:
- ${ocaml:Provides}, 
+ ${ocaml:Provides},
  ${F:BestProvides},
  libnums-ocaml-dev
-Suggests: 
- ocaml-doc, 
- libgdbm-dev, 
+Suggests:
+ ocaml-doc,
+ libgdbm-dev,
  tuareg-mode | ocaml-mode
 Recommends:
  camlp4,
@@ -107,7 +108,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  ${ocaml:Depends},
- camlp4-${F:OCamlABI} 
+ camlp4-${F:OCamlABI}
 Description: Pre Processor Pretty Printer for OCaml - extras
  Objective Caml (OCaml) is an implementation of the ML language,
  based on the Caml Light dialect extended with a complete
@@ -130,7 +131,7 @@ Depends:
  ${misc:Depends},
  ${ocaml:Depends},
  libx11-dev
-Provides: 
+Provides:
  ${ocaml:Provides}
 Suggests:
  tcl8.4-dev,
@@ -165,7 +166,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  ${ocaml:Depends}
-Provides: 
+Provides:
  ${ocaml:Provides}
 Replaces:
  ocaml-interp (<< 3.11.1-3),
@@ -191,7 +192,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  ${ocaml:Depends}
-Provides: 
+Provides:
  ${ocaml:Provides}
 Description: Runtime system for OCaml bytecode executables
  Objective Caml (OCaml) is an implementation of the ML language, based on
@@ -242,7 +243,7 @@ Depends:
  ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
-Provides: 
+Provides:
  ocaml-interp-${F:OCamlABI}
 Recommends: ledit | readline-editor
 Replaces: ocaml (<< 3.07.2a-3)
@@ -262,7 +263,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  ocaml-nox-${F:OCamlABI}
-Provides: 
+Provides:
  ocaml-compiler-libs-${F:OCamlABI}
 Description: OCaml interpreter and standard libraries
  Objective (OCaml) is an implementation of the ML language, based on

diff --git a/debian/ocaml-base-nox.postinst.in b/debian/ocaml-base-nox.postinst.in
index 589d8c8859836022ce404e65cc81d565979efdf3..8cab42917e4a04ca56034b05a8d999ede26af5cc 100644 (file)
--- a/debian/ocaml-base-nox.postinst.in
+++ b/debian/ocaml-base-nox.postinst.in
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
+
 if [ ! -e /usr/local/lib/ocaml ]; then
     if mkdir /usr/local/lib/ocaml 2>/dev/null; then
        chown root:staff /usr/local/lib/ocaml

diff --git a/debian/ocaml-base-nox.prerm.in b/debian/ocaml-base-nox.prerm.in
index d402b7dceb581498e615983e82da15edf897c57a..15a3aa7cfc34d127c36e491fb6518b527f93d669 100644 (file)
--- a/debian/ocaml-base-nox.prerm.in
+++ b/debian/ocaml-base-nox.prerm.in
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
 
 rmdir /usr/local/lib/ocaml/@OCamlABI@/stublibs 2>/dev/null || true
 rmdir /usr/local/lib/ocaml/@OCamlABI@ 2>/dev/null || true

diff --git a/debian/ocaml-interp.dirs.in b/debian/ocaml-interp.dirs.in
deleted file mode 100644 (file)
index 4469dc0..0000000
--- a/debian/ocaml-interp.dirs.in
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin
-usr/share/man/man1
-usr/share/pixmaps
-@OCamlStdlibDir@

diff --git a/debian/ocaml-nox.postinst.in b/debian/ocaml-nox.postinst.in
index e5d14cedcb41d0a7c6c8ec38040a967aa6d3b1b1..8e32f2fb5fb36cf5a2b07c5c2bc9f0ceb267c3cf 100644 (file)
--- a/debian/ocaml-nox.postinst.in
+++ b/debian/ocaml-nox.postinst.in
@@ -1,11 +1,9 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
 
 if [ "$1" = "configure" ]; then
   ln -sf @OCamlStdlibDir@/caml /usr/include/
 
-  # TEMPORARILY DISABLED while moving ocaml-md5sums to dh-ocaml
-  #ocaml-md5sums update
-
   # Save Emacs conffiles from previous ocaml versions
   for f in ocaml ocaml-nox ; do
     file="/etc/emacs/site-start.d/50$f.el"

diff --git a/debian/ocaml-nox.postrm b/debian/ocaml-nox.postrm
index d36b438e821969b149a847b1b26cf35bb089e39f..3dc4359eeeac267c22edfc29bd82a28ac605c92a 100644 (file)
--- a/debian/ocaml-nox.postrm
+++ b/debian/ocaml-nox.postrm
@@ -1,12 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
 
 rm -f /usr/include/caml
 
-# TEMPORARILY DISABLED while moving ocaml-md5sums to dh-ocaml
-#if [ "$1" = "remove" ]; then
-#  if [ -x /usr/bin/ocaml-md5sums ]; then
-#    /usr/bin/ocaml-md5sums update
-#  fi
-#fi
-
 #DEBHELPER#

diff --git a/debian/ocaml-nox.preinst b/debian/ocaml-nox.preinst
index 49819b32472c6e14b56d8a3851c09b02beaaf184..c7e4af2d4ebc55199e24dc25564aede141f6755b 100644 (file)
--- a/debian/ocaml-nox.preinst
+++ b/debian/ocaml-nox.preinst
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
 
 if [ ! -h /usr/include/caml ] && [ -e /usr/include/caml ]; then
        echo "WARNING, /usr/include/caml is not a symlink !!!!"