[SCM] Debian GNU Hurd packaging branch, master, updated. upstream/20110303-448-g066316e

[Samuel Thibault]

The following commit has been merged in the master branch:
commit 066316e93d3ba61f533b75b5f0f65458886c4f11
Author: Samuel Thibault <address@hidden>
Date:   Wed Mar 9 01:26:09 2011 +0100

    Fix -K option into not starting existing translators.

diff --git a/debian/changelog b/debian/changelog
index 80e1e17..05ee2c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ hurd (20110303-1) UNRELEASED; urgency=low
   * debian/local/finish-install.d/51hurd_config-target-network: Record active
     network configuration, not only passive. Create /servers/socket/26 node if
     it doesn't exist yet.
+  * debian/local/setup-translators, debian/patches/makedev_keep_options.patch:
+    Fix -K option into not starting existing translators.
 
   [ Justus Winter ]
   * debian/hurd.{postinst,postrm}: Add/remove loginpr shell and login user with
diff --git a/debian/local/setup-translators b/debian/local/setup-translators
index 96e6bb9..348090a 100755
--- a/debian/local/setup-translators
+++ b/debian/local/setup-translators
@@ -75,7 +75,7 @@ st () {
        name=${3:-$cmdl}
 
        echo -n " $name"
-       if [ "$REPLACE" = y ] || [ ! -e $1 ]; then
+       if [ "$REPLACE" = y ] || ! showtrans $1 > /dev/null 2>&1 ; then
                # Work around a bug in ext2fs, which crashes if a non-empty
                # file is turned into a symlink through settrans, by clearing
                # the passive translator first.
diff --git a/debian/patches/makedev_keep_options.patch 
b/debian/patches/makedev_keep_options.patch
index 90a6c6e..353bb21 100644
--- a/debian/patches/makedev_keep_options.patch
+++ b/debian/patches/makedev_keep_options.patch
@@ -43,7 +43,7 @@ Index: hurd/sutils/MAKEDEV.sh
    local PERM="$3"
    shift 3
 -  if cmd settrans -cg "$NODE"; then
-+  if [ "$KEEP" ] && [ -e "$NODE" ]; then
++  if [ "$KEEP" ] && showtrans "$NODE" > /dev/null 2>&1 ; then
 +    return;
 +  fi
 +  if cmd settrans $STFLAGS -c "$NODE"; then

-- 
Debian GNU Hurd packaging