[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/3.0.1-1-11-gb3b19e0

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 4e46d13c44c24b6557ca77eb9d244ce156b19781
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Aug 5 21:52:33 2010 -0400

    Fix various Lintian tags

diff --git a/debian/control b/debian/control
index cf0f49a..3bdcc70 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,8 @@ Uploaders:
  Mehdi Dogguy <mehdi at debian.org>
 Homepage: http://mldonkey.sourceforge.net/
 Build-Depends: autoconf, autotools-dev,
- ocaml-nox (>= 3.11.1),
- ocaml-best-compilers | ocaml-nox,
+ ocaml-nox (>= 3.11.1-3~),
+ ocaml-best-compilers,
  dh-ocaml (>= 0.9.1),
  camlp4,
  debhelper (>= 7.0.50~),
diff --git a/debian/mldonkey-gui.desktop b/debian/mldonkey-gui.desktop
index 453ec16..50ed170 100644
--- a/debian/mldonkey-gui.desktop
+++ b/debian/mldonkey-gui.desktop
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Type=Application
 Name=MLDonkey
 Comment=Graphical frontend for MLDonkey
diff --git a/debian/mldonkey-server.config b/debian/mldonkey-server.config
index 26bde96..d78c6a9 100644
--- a/debian/mldonkey-server.config
+++ b/debian/mldonkey-server.config
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 # Debconf configuration script for MLDonkey server.
 # by Sylvain Le Gall <gildor at debian.org>
@@ -24,7 +26,7 @@ fi
 
 # If it is the first time we install: set a default hostname
 if [ ! -n "$MLDONKEY_DIR" ] || [ ! -d $MLDONKEY_DIR ] || [ ! -f $MLDONKEY_DIR/downloads.ini ]; then
-    client_name=`/bin/hostname`
+    client_name=`hostname`
 fi
 
 # Do we start at startup?
diff --git a/debian/mldonkey-server.init b/debian/mldonkey-server.init
index 185df38..83f0c87 100644
--- a/debian/mldonkey-server.init
+++ b/debian/mldonkey-server.init
@@ -13,8 +13,8 @@
 #
 ### BEGIN INIT INFO
 # Provides:          mldonkey-server
-# Required-Start:    $network
-# Required-Stop:     $network
+# Required-Start:    $network $remote_fs
+# Required-Stop:     $network $remote_fs
 # Should-Start:      $local_fs
 # Should-Stop:       $local_fs
 # Default-Start:     2 3 4 5
diff --git a/debian/mldonkey-server.postinst b/debian/mldonkey-server.postinst
index f63fb45..a5ce7b9 100644
--- a/debian/mldonkey-server.postinst
+++ b/debian/mldonkey-server.postinst
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 init_error ()
 {
@@ -28,7 +30,7 @@ case "$1" in
     run_as_user=mldonkey
     mldonkey_group=mldonkey
     new_mldonkey_dir="/var/lib/mldonkey"
-    client_name=`/bin/hostname`
+    client_name=`hostname`
 
     ###################
     # User management #
@@ -49,7 +51,7 @@ case "$1" in
         $DEBUG && echo "done."
     fi
 
-    run_as_useruid=`/usr/bin/id -u $run_as_user`
+    run_as_useruid=`id -u $run_as_user`
 
     if [ ! -d $new_mldonkey_dir ]; then
         $DEBUG && echo -n "Creating mldonkey home directory: "
@@ -148,7 +150,7 @@ EOF
     # /etc/default/mldonkey-server #
     ################################
 
-    CONF_NEW=`/bin/tempfile`
+    CONF_NEW=`tempfile`
     $DEBUG && echo -n "Writing new values to $CONF_NEW: "
 
     cat > "$CONF_NEW" <<EOF
diff --git a/debian/mldonkey-server.postrm b/debian/mldonkey-server.postrm
index b8bc27c..e76df81 100644
--- a/debian/mldonkey-server.postrm
+++ b/debian/mldonkey-server.postrm
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 # This script is called twice during the removal of the package; once
 # after the removal of the package's files from the system, and as
diff --git a/debian/mldonkey-server.preinst b/debian/mldonkey-server.preinst
index 910f99a..53ffc62 100644
--- a/debian/mldonkey-server.preinst
+++ b/debian/mldonkey-server.preinst
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 CONFFILE=/etc/default/mldonkey-server
 
diff --git a/debian/mldonkey-server.prerm b/debian/mldonkey-server.prerm
index d0447d4..8f2e325 100644
--- a/debian/mldonkey-server.prerm
+++ b/debian/mldonkey-server.prerm
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 # Workaround bug in previous versions of the init.d script (--oknodo was
 # missing), see: #378934.

-- 
mldonkey packaging