~ubuntu-branches/ubuntu/vivid/wpasupplicant/vivid

« back to all changes in this revision

Viewing changes to debian/patches/02_debian_doc_examples.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Kel Modderman
  • Date: 2008-03-12 20:03:04 UTC
  • mfrom: (1.1.10 upstream)
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20080312200304-4331y9wj46pdd34z
Tags: 0.6.3-1
* New upstream release.
* Drop patches applied upstream:
  - debian/patches/30_wpa_gui_qt4_eventhistoryui_rework.patch
  - debian/patches/31_wpa_gui_qt4_eventhistory_always_scrollbar.patch
  - debian/patches/32_wpa_gui_qt4_eventhistory_scroll_with_events.patch
  - debian/patches/40_dbus_ssid_data.patch
* Tidy up the clean target of debian/rules. Now that the madwifi headers are
  handled differently we no longer need to do any cleanup.
* Fix formatting error in debian/ifupdown/wpa_action.8 to make lintian
  quieter.
* Add patch to fix formatting errors in manpages build from sgml source. Use
  <emphasis> tags to hightlight keywords instead of surrounding them in
  strong quotes.
  - debian/patches/41_manpage_format_fixes.patch
* wpasupplicant binary package no longer suggests pcscd, guessnet, iproute
  or wireless-tools, nor does it recommend dhcp3-client. These are not
  needed.
* Add debian/patches/10_silence_siocsiwauth_icotl_failure.patch to disable
  ioctl failure messages that occur under normal conditions.
* Cherry pick two upstream git commits concerning the dbus interface:
  - debian/patches/11_avoid_dbus_version_namespace.patch
  - debian/patches/12_fix_potential_use_after_free.patch
* Add debian/patches/42_manpage_explain_available_drivers.patch to explain
  that not all of the driver backends are available in the provided
  wpa_supplicant binary, and that the canonical list of supported driver
  backends can be retrieved from the wpa_supplicant -h (help) output.
  (Closes: #466910)
* Add debian/patches/20_wpa_gui_qt4_disable_link_prl.patch to remove
  link_prl CONFIG compile flag added by qmake-qt4 >= 4.3.4-2 to avoid excess
  linking.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## 02_debian_doc_examples.patch by Kel Modderman <kelmo@kanotixguide.org>
3
 
##
4
 
## DP: Add Debian specific path to docs and examples to wpa_supplicant.conf(8)
5
 
 
6
 
@DPATCH@
7
 
diff -Nrup wpa_supplicant-0.5.5.orig/doc/docbook/wpa_supplicant.conf.5 wpa_supplicant-0.5.5/doc/docbook/wpa_supplicant.conf.5
8
 
--- wpa_supplicant-0.5.5.orig/doc/docbook/wpa_supplicant.conf.5 2006-08-28 14:19:12.000000000 +1000
9
 
+++ wpa_supplicant-0.5.5/doc/docbook/wpa_supplicant.conf.5      2006-11-07 16:09:32.000000000 +1000
10
 
@@ -16,6 +16,11 @@ probably in \fB/usr/share/doc/wpa_suppli
11
 
 detailed information about the configuration format and supported
12
 
 fields.
13
 
 .PP
14
 
+On Debian systems example configuration files are located at
15
 
+\fB/usr/share/doc/wpasupplicant/examples/\fR. Use
16
 
+\fB/usr/share/doc/wpasupplicant/examples/wpa_supplicant.conf.template\fR
17
 
+as a starting point for a custom configuration file.
18
 
+.PP
19
 
 All file paths in this configuration file should use full
20
 
 (absolute, not relative to working directory) path in order to allow
21
 
 working directory to be changed. This can happen if wpa_supplicant is