[pkg-wpa-devel] r1632 - in /hostapd/trunk/debian: changelog control init.d

[slh-guest at users.alioth.debian.org]

Author: slh-guest
Date: Mon Dec 12 00:46:38 2011
New Revision: 1632

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1632
Log:
import latest changes, by Kel Modderman <kel at otaku42.de>:

* Adjust standards version to 3.9.2, no further changes required to
  satisfy that.
* Only test that DAEMON_CONF is set in init.d script, do not test if what is
  set is readable (which assumes only one configuration file is being used).
  (Closes: #615821)

Modified:
    hostapd/trunk/debian/changelog
    hostapd/trunk/debian/control
    hostapd/trunk/debian/init.d

Modified: hostapd/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/changelog?rev=1632&op=diff
==============================================================================
--- hostapd/trunk/debian/changelog (original)
+++ hostapd/trunk/debian/changelog Mon Dec 12 00:46:38 2011
@@ -7,11 +7,16 @@
   * Add a loop to ifupdown.sh to wait for creation of hostapd pid file before
     attempting creation of sensigs omission pid file, in some cases hostapd
     daemon can return before creation of the pid file has been written to disk.
+  * Adjust standards version to 3.9.2, no further changes required to
+    satisfy that.
+  * Only test that DAEMON_CONF is set in init.d script, do not test if what is
+    set is readable (which assumes only one configuration file is being used).
+    (Closes: #615821)
 
   [ Stefan Lippers-Hollmann ]
   * use new anonscm URIs for alioth.
 
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Mon, 25 Jul 2011 15:57:21 +0200
+ -- Kel Modderman <kel at otaku42.de>  Sun, 11 Dec 2011 20:32:06 +1000
 
 hostapd (1:0.7.3-2) unstable; urgency=low
 

Modified: hostapd/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/control?rev=1632&op=diff
==============================================================================
--- hostapd/trunk/debian/control (original)
+++ hostapd/trunk/debian/control Mon Dec 12 00:46:38 2011
@@ -8,7 +8,7 @@
 Build-Depends: debhelper (>= 7.3.7~),
  libssl-dev,
  libnl-dev (>= 1.1)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://w1.fi/
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-wpa/hostapd/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-wpa/hostapd/trunk/

Modified: hostapd/trunk/debian/init.d
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/init.d?rev=1632&op=diff
==============================================================================
--- hostapd/trunk/debian/init.d (original)
+++ hostapd/trunk/debian/init.d Mon Dec 12 00:46:38 2011
@@ -23,7 +23,7 @@
 
 [ -x "$DAEMON_SBIN" ] || exit 0
 [ -s "$DAEMON_DEFS" ] && . /etc/default/hostapd
-[ -r "$DAEMON_CONF" ] || exit 0
+[ -n "$DAEMON_CONF" ] || exit 0
 
 DAEMON_OPTS="-B -P $PIDFILE $DAEMON_OPTS $DAEMON_CONF"