[pkg-wpa-devel] r997 - in /hostapd/trunk/debian: README.Debian changelog default rules

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

Author: kelmo-guest
Date: Sun Jan  6 06:30:35 2008
New Revision: 997

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=997
Log:
* Document the two methods of managing hostapd in README.Debian. Also add a
  hint to /etc/default/hostapd to consult README.Debian for more
  information. (Closes: #443786)
* Cleanup of debian/rules, actually honor nostrip by specifying default
  CFLAGS when invoking make. Remove redundant commented out content.

Modified:
    hostapd/trunk/debian/README.Debian
    hostapd/trunk/debian/changelog
    hostapd/trunk/debian/default
    hostapd/trunk/debian/rules

Modified: hostapd/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/README.Debian?rev=997&op=diff
==============================================================================
--- hostapd/trunk/debian/README.Debian (original)
+++ hostapd/trunk/debian/README.Debian Sun Jan  6 06:30:35 2008
@@ -1,5 +1,25 @@
 hostapd for Debian
 ------------------
+
+This package provides two methods for managing hostapd process(es); an
+initscript and an ifupdown hook. Both methods require you understand and
+customize the default configuraion file (/etc/hostapd/hostapd.conf) to
+function correctly.
+
+To use the initscript method see /etc/default/hostapd.
+
+To use the ifupdown method, the path to hostapd configuration file can
+be specified in a network interfaces configuration stanza in
+/etc/network/interfaces like so:
+
+iface eth1 inet static
+	hostapd /etc/hostapd/hostapd.conf
+	...
+
+The hostapd process will be started in the pre-up phase of ifup, and be
+terminated in the post-down phase of ifdown.
+
+ -- Kel Modderman <kel at otaku42.de>  Sun, 06 Jan 2008 16:27:01 +1000
 
 Please note:
 * If you want to use hostapd with a prism54-based card, please make sure you

Modified: hostapd/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/changelog?rev=997&op=diff
==============================================================================
--- hostapd/trunk/debian/changelog (original)
+++ hostapd/trunk/debian/changelog Sun Jan  6 06:30:35 2008
@@ -1,3 +1,13 @@
+hostapd (1:0.5.9-2) UNRELEASED; urgency=low
+
+  * Document the two methods of managing hostapd in README.Debian. Also add a
+    hint to /etc/default/hostapd to consult README.Debian for more
+    information. (Closes: #443786)
+  * Cleanup of debian/rules, actually honor nostrip by specifying default
+    CFLAGS when invoking make. Remove redundant commented out content.
+
+ -- Kel Modderman <kel at otaku42.de>  Sun, 06 Jan 2008 16:27:01 +1000
+
 hostapd (1:0.5.9-1) unstable; urgency=low
 
   * New upstream release.

Modified: hostapd/trunk/debian/default
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/default?rev=997&op=diff
==============================================================================
--- hostapd/trunk/debian/default (original)
+++ hostapd/trunk/debian/default Sun Jan  6 06:30:35 2008
@@ -1,4 +1,7 @@
 # Defaults for hostapd initscript
+
+# See /usr/share/doc/hostapd/README.Debian for information
+# about alternative methods of managing hostapd.
 
 # Uncomment the following line to run hostapd on startup
 # WARNING! Depending on your configuration,

Modified: hostapd/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/rules?rev=997&op=diff
==============================================================================
--- hostapd/trunk/debian/rules (original)
+++ hostapd/trunk/debian/rules Sun Jan  6 06:30:35 2008
@@ -1,7 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -10,15 +7,12 @@
 
 PACKAGE=hostapd
 
-CFLAGS = -Wall -g
+CFLAGS = -MMD -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
 	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
 endif
 
 build: build-stamp
@@ -26,7 +20,7 @@
 build-stamp: patch
 	dh_testdir
 
-	$(MAKE)
+	CFLAGS="$(CFLAGS)" $(MAKE)
 
 	touch build-stamp
 
@@ -63,10 +57,7 @@
 	dh_installdocs
 	dh_installexamples
 	dh_install
-#	dh_installdebconf	
-#	dh_installlogrotate
 	dh_installinit
-#	dh_installcron
 	dh_installman hostapd.8 hostapd_cli.1
 	dh_link
 	dh_strip