From: gregor herrmann <gregoa@debian.org>
Date: Sun, 22 Jul 2007 14:37:47 +0000 (-0000)
Subject: * Fix usage of MAKEDEV, thanks to Marco d'Itri (closes: #434160).
X-Git-Tag: debian/0.4.0-3
X-Git-Url: https://git.toastfreeware.priv.at/debian/iodine.git/commitdiff_plain/91fe4cc9fed03aae0828e37608f836c063a14bb7?ds=sidebyside

* Fix usage of MAKEDEV, thanks to Marco d'Itri (closes: #434160).
---

diff --git a/debian/changelog b/debian/changelog
index acf3604..4a3f52b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-iodine (0.4.0-3) UNRELEASED; urgency=low
+iodine (0.4.0-3) unstable; urgency=low
 
   * Add Portuguese translation for debconf messages, thanks to Américo
     Monteiro and Miguel Figueiredo (closes: #433041).
@@ -8,8 +8,9 @@ iodine (0.4.0-3) UNRELEASED; urgency=low
     (closes: #433297).
   * Add debconf-updatepo to debian/rule's clean target.
   * Convert debian/changelog to UTF-8.
+  * Fix usage of MAKEDEV, thanks to Marco d'Itri (closes: #434160).
 
- -- gregor herrmann <gregor+debian@comodo.priv.at>  Mon, 16 Jul 2007 16:24:31 +0200
+ -- gregor herrmann <gregor+debian@comodo.priv.at>  Sun, 22 Jul 2007 16:27:51 +0200
 
 iodine (0.4.0-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 4055ef8..950b0a8 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ XS-Vcs-Browser: http://svn.toastfreeware.priv.at/wsvn/ToastfreewareDebian/iodine
 
 Package: iodine
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, makedev, adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, udev | makedev, adduser
 Description: tool for tunneling IPv4 data through a DNS server
  This is a piece of software that lets you tunnel IPv4 data through a DNS
  server. This can be usable in different situations where internet access is
diff --git a/debian/postinst b/debian/postinst
index 478d014..7ea4779 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -22,28 +22,26 @@ set -e
 
 case "$1" in
     configure)
-    	# we need a tun device
-    	if [ ! -e /dev/net/tun ] ; then
-	    	echo "Creating device /dev/net/tun ..."
-	    	cd /dev && WRITE_ON_UDEV=false ./MAKEDEV tun
-	    fi
-	    # and we want a special user
-	    adduser --quiet --system --home /var/run/iodine iodine
-      # generate /etc/default/iodine
-      db_get iodine/start_daemon
-      START_IODINED=$RET
-      db_get iodine/daemon_options
-      IODINED_ARGS=$RET
-      db_get iodine/daemon_password
-      IODINED_PASSWORD=$RET
-      cat <<EOF > /etc/default/iodine
+        # we need a tun device
+        echo "Creating device /dev/net/tun ..."
+        cd /dev && ./MAKEDEV tun
+        # and we want a special user
+        adduser --quiet --system --home /var/run/iodine iodine
+        # generate /etc/default/iodine
+        db_get iodine/start_daemon
+        START_IODINED=$RET
+        db_get iodine/daemon_options
+        IODINED_ARGS=$RET
+        db_get iodine/daemon_password
+        IODINED_PASSWORD=$RET
+        cat <<EOF > /etc/default/iodine
 # Default settings for iodine. This file is sourced from
 # /etc/init.d/iodined
 START_IODINED="$START_IODINED"
 IODINED_ARGS="$IODINED_ARGS"
 IODINED_PASSWORD="$IODINED_PASSWORD"
 EOF
-      [ -e /etc/default/iodine ] && chmod 600 /etc/default/iodine
+        [ -e /etc/default/iodine ] && chmod 600 /etc/default/iodine
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)