[pkg-wpa-devel] r1118 - in /wpasupplicant/trunk: ./ debian/changelog debian/extra-examples/ debian/extra-examples/wpa-roam.conf debian/patches/01_debian_wpa_roam_example.patch debian/patches/series debian/wpasupplicant.examples

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Fri Feb 8 19:20:42 UTC 2008 

Author: siretart
Date: Fri Feb  8 19:20:42 2008
New Revision: 1118

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1118
Log:
Small simplification to packaging

Move debian/patches/01_debian_wpa_roam_example.patch to
debian/extra-examples/wpa-roam.conf to have the example as proper file
instead of a diff.

Added:
    wpasupplicant/trunk/debian/extra-examples/
    wpasupplicant/trunk/debian/extra-examples/wpa-roam.conf
Removed:
    wpasupplicant/trunk/debian/patches/01_debian_wpa_roam_example.patch
Modified:
    wpasupplicant/trunk/   (props changed)
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/patches/series
    wpasupplicant/trunk/debian/wpasupplicant.examples

Propchange: wpasupplicant/trunk/
------------------------------------------------------------------------------
--- bzr:file-ids (original)
+++ bzr:file-ids Fri Feb  8 19:20:42 2008
@@ -1,0 +1,2 @@
+debian/extra-examples	extraexamples-20080208190341-7k5r5ffuxjxupx5s-1
+debian/extra-examples/wpa-roam.conf	wparoam.conf-20080208190341-7k5r5ffuxjxupx5s-2

Propchange: wpasupplicant/trunk/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-trunk1 (original)
+++ bzr:revision-id:v3-trunk1 Fri Feb  8 19:20:42 2008
@@ -1,3 +1,4 @@
 138 siretart at tauware.de-20080109171911-xgx0s53g6ume0agv
 208 siretart at tauware.de-20080203092855-6lr5cmb8yg8so1pd
 211 siretart at tauware.de-20080204141950-p8m207cdmgmhn6r0
+224 siretart at tauware.de-20080208191859-hfjvib7w26op96jm

Propchange: wpasupplicant/trunk/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Fri Feb  8 19:20:42 2008
@@ -1,4 +1,4 @@
-timestamp: 2008-02-04 15:19:50.140000105 +0100
+timestamp: 2008-02-08 20:18:59.927000046 +0100
 committer: Reinhard Tartler <siretart at tauware.de>
 properties: 
 	branch-nick: wpasupplicant.trunk.bzr

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1118&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Fri Feb  8 19:20:42 2008
@@ -1,5 +1,6 @@
 wpasupplicant (0.6.2+git20080206.g8c0dad4-1) UNRELEASED; urgency=low
 
+  [ Kel Modderman ]
   * New Upstream git snapshot.
     - fixes infinite loop in EAPOL state machine when dynamic wep keys are
       used (Closes: #464514)
@@ -24,7 +25,12 @@
     - debian/patches/31_wpa_gui_qt4_eventhistory_always_scrollbar.patch
     - debian/patches/32_wpa_gui_qt4_eventhistory_scroll_with_events.patch
 
- -- Kel Modderman <kel at otaku42.de>  Thu, 07 Feb 2008 20:13:37 +1000
+  [ Reinhard Tartler ]
+  * move debian/patches/01_debian_wpa_roam_example.patch to
+    debian/extra-examples/wpa-roam.conf to have the example as proper file
+    instead of a diff.
+
+ -- Reinhard Tartler <siretart at tauware.de>  Fri, 08 Feb 2008 20:17:56 +0100
 
 wpasupplicant (0.6.2+git20080202.gde6ccd7-1) unstable; urgency=low
 

Added: wpasupplicant/trunk/debian/extra-examples/wpa-roam.conf
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/extra-examples/wpa-roam.conf?rev=1118&op=file
==============================================================================
--- wpasupplicant/trunk/debian/extra-examples/wpa-roam.conf (added)
+++ wpasupplicant/trunk/debian/extra-examples/wpa-roam.conf Fri Feb  8 19:20:42 2008
@@ -1,0 +1,85 @@
+######################## Debian wpa-roam Template #############################
+#
+# Template configuration for wpa-roam mode of Debian's wpasupplicant package.
+# wpa-roam mode is described in detail in the wpa_action(8) manpage, and also
+# at /usr/share/doc/wpasupplicant/README.modes.gz. Please read these documents
+# to get an overview of how to setup this mode.
+#
+# For a detailed set of configuration examples for different networks, refer to
+# /usr/share/doc/wpasupplicant/README.wpa_supplicant.conf.gz
+#
+# Also see the other files in /usr/share/doc/wpasupplicant/examples/ for
+# specific network configuration examples.
+#
+# Empty lines and lines starting with # are ignored
+#
+# NOTE! This file may contain password information and should be made readable
+# only by root user or netdev group on multiuser systems.
+#
+######################## Global Configuration Options #########################
+#
+# The update_config option can be used to allow wpa_supplicant to overwrite
+# configuration file whenever configuration is changed (e.g., new network block
+# is added with wpa_cli or wpa_gui, or a password is changed). This is required
+# for wpa_cli/wpa_gui to be able to store the configuration changes
+# permanently.
+#
+# NOTE! Any comments will be removed from the configuration file when the
+# update_config option is used.
+#
+#update_config=1
+
+# The ctrl_interface specifies the path to a unix socket through which the
+# supplicant may be controlled and interacted with.
+#
+# DIR=   Path to UNIX socket control interface, mandatory for wpa-roam mode
+# GROUP= Users in this group to control wpa_supplicant via wpa_cli/wpa_gui
+#
+ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev
+#
+######################## Network Block Configurations #########################
+#
+# Each network is configured as a separate block in this configuration file.
+# The network blocks are listed in preference of order, the top most network
+# to be found in scan results is used.
+#
+# By default, all networks will get same priority (0). If some of the networks
+# are more desirable, the "priority=" network parameter can be used to change
+# the order in which wpa_supplicant goes through the network blocks when
+# selecting what network will be used. The priority groups will be iterated
+# in decreasing priority, the network with the highest priority value will be
+# considered for selection first and the network with the lowest priority value
+# will be considered last.
+#
+# NOTE! The scan_ssid=1 and ap_scan=2 modes ignore the priority field. Instead,
+# the networks will be considered in the order specified in this configuration
+# file.
+#
+# The "id_str=" network identifier string parameter is given to wpa_action when
+# a network has been selected, and contains this field in its configuration
+# block. The given id_str string will be used to select a logical interfaces
+# from ifupdown's /etc/network/interfaces file.
+#
+###############################################################################
+
+#network={
+#	ssid="Example WEP Network"
+#	key_mgmt=NONE
+#	wep_key0=6162636465
+#	wep_tx_keyidx=0
+#	id_str="johns_house"
+#}
+
+#network={
+#	ssid="Example WPA Network"
+#	psk="mysecretpassphrase"
+#	id_str="home"
+#}
+
+###############################################################################
+# Default behaviour is to associate with any open access point, further
+# networks can be configured with wpa_cli/wpa_gui.
+#
+network={
+	key_mgmt=NONE
+}

Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1118&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Fri Feb  8 19:20:42 2008
@@ -1,5 +1,4 @@
 00_defconfig.patch
-01_debian_wpa_roam_example.patch
 02_dbus_group_policy.patch
 03_dbus_service_activation_logfile.patch
 04_append_mmd_to_default_cflags.patch

Modified: wpasupplicant/trunk/debian/wpasupplicant.examples
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.examples?rev=1118&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.examples (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.examples Fri Feb  8 19:20:42 2008
@@ -1,1 +1,2 @@
 wpa_supplicant/examples/*.conf
+debian/extra-examples/*.conf

More information about the Pkg-wpa-devel mailing list