[pkg-wpa-devel] r1465 - in /wpasupplicant/trunk/debian: ./ ifupdown/ patches/ source/
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Thu Feb 11 03:58:50 UTC 2010
Author: kelmo-guest
Date: Thu Feb 11 03:58:49 2010
New Revision: 1465
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1465
Log:
them at build time, do not build-depend on dockbook. We currently do
not modify them, so these build-dependencies and steps are expensive.
- build depend on debhelper (>= 7.4.12~) for dh override support, qmake
build class support and --builddirectory argument support
* CFLAGS, CXXFLAGS, LDFLAGS and V are exported by debian/rules.
* Remove uupdate command from debian/watch, it is not useful.
* Bump Standards-Version to 3.8.4, no extra changes required.
* wpa_action shell functions ifup and ifdown create and delete the
wpa_supplicant sendsigs omission file thus removing the need for
/etc/init.d/wpa-ifupdown. Remove /etc/init.d/wpa-ifupdown on upgrade
via maintainer scripts. (Closes: #545173)
* Drop debian/patches/05_qmake_version_makefile.patch, use qmake build
class in debian/rules, Build-Depend on qt4-qmake and Build-Conflict
with libqt3-dev.
Added:
wpasupplicant/trunk/debian/README.source
Removed:
wpasupplicant/trunk/debian/patches/05_qmake_version_makefile.patch
wpasupplicant/trunk/debian/wpasupplicant.wpa-ifupdown.init
Modified:
wpasupplicant/trunk/debian/changelog
wpasupplicant/trunk/debian/control
wpasupplicant/trunk/debian/ifupdown/functions.sh
wpasupplicant/trunk/debian/patches/series
wpasupplicant/trunk/debian/rules
wpasupplicant/trunk/debian/source/format
wpasupplicant/trunk/debian/wpasupplicant.postinst
wpasupplicant/trunk/debian/wpasupplicant.postrm
wpasupplicant/trunk/debian/wpasupplicant.preinst
Added: wpasupplicant/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/README.source?rev=1465&op=file
==============================================================================
--- wpasupplicant/trunk/debian/README.source (added)
+++ wpasupplicant/trunk/debian/README.source Thu Feb 11 03:58:49 2010
@@ -1,0 +1,58 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+ for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+ if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+ export QUILT_PATCHES=debian/patches
+ break
+ fi
+ done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+ quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+ quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches. Then, for every file that will be modified by this patch,
+run:
+
+ quilt add <file>
+
+before editing those files. You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly. After editing the files, run:
+
+ quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+ quilt import -P <patch> /path/to/patch
+ quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches. The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+ quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1465&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Thu Feb 11 03:58:49 2010
@@ -23,27 +23,30 @@
* Support help action in action_wpa.sh. (Closes: #548995)
* Build-depend on libreadline-dev instead of libreadline5-dev.
(Closes: #553891)
- * Update wpa-ifupdown.init description to avoid confusion about
- whether or not the script is used currently.
* Do not use sed to comment all network blocks out in the example
wpa_supplicant.conf.
* Do not strip upstream manual pages from source tree, do no generate
- them at build time, do not build-depend on dockbook.
+ them at build time, do not build-depend on dockbook. We currently do
+ not modify them, so these build-dependencies and steps are expensive.
* Convert debian/rules to use dh
- - build depend on debhelper (>= 7.0.50~) dh override support
+ - build depend on debhelper (>= 7.4.12~) for dh override support, qmake
+ build class support and --builddirectory argument support
- install wpagui files via debian/wpagui.install
- rename debian/ifupdown/wpa_action.sh to debian/ifupdown/wpa_action
and install via debian/wpasupplicant.install
- install wpasupplicant ifupdown scripts via debian/wpasupplicant.install
- * Use 3.0 (quilt) package format, drop build dependency of quilt and remove
- debian/README.source.
- * Remove uupdate command from debian/watch, it is no longer useful.
+ * CFLAGS, CXXFLAGS, LDFLAGS and V are exported by debian/rules.
+ * Remove uupdate command from debian/watch, it is not useful.
* Add ${misc:Depends} to debian/control for debhelpers to use as required.
* Remove debian/get-git-snapshot and debian/rules target.
- * Bump Standards-Version to 3.8.3, no extra changes required.
+ * Bump Standards-Version to 3.8.4, no extra changes required.
* wpa_action shell functions no longer require an ifupdown state file
to function as future providers of ifup/ifdown may not need or
provide it.
+ * wpa_action shell functions ifup and ifdown create and delete the
+ wpa_supplicant sendsigs omission file thus removing the need for
+ /etc/init.d/wpa-ifupdown. Remove /etc/init.d/wpa-ifupdown on upgrade
+ via maintainer scripts. (Closes: #545173)
* Drop debian/patches/10_multi_driver.patch due to its invasiveness -
it may make future patches which fix serious issues harder to apply
while providing an experimental feature only.
@@ -54,8 +57,11 @@
bubbles - they are too frequent.
* Cherry pick 19_cfg80211_optimisation.patch from upstream to avoid using
an expensive hack for cfg80211-aware kernel drivers for disconnect events.
-
- -- Kel Modderman <kel at otaku42.de> Sat, 30 Jan 2010 00:34:41 +1000
+ * Drop debian/patches/05_qmake_version_makefile.patch, use qmake build
+ class in debian/rules, Build-Depend on qt4-qmake and Build-Conflict
+ with libqt3-dev.
+
+ -- Kel Modderman <kel at otaku42.de> Thu, 11 Feb 2010 13:37:18 +1000
wpasupplicant (0.6.9-3) unstable; urgency=low
Modified: wpasupplicant/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/control?rev=1465&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/control (original)
+++ wpasupplicant/trunk/debian/control Thu Feb 11 03:58:49 2010
@@ -1,8 +1,10 @@
Source: wpasupplicant
Section: net
Priority: optional
-Maintainer: Kel Modderman <kel at otaku42.de>
+Maintainer: Debian/Ubuntu wpasupplicant Maintainers <pkg-wpa-devel at lists.alioth.debian.org>
+Uploaders: Kel Modderman <kel at otaku42.de>
Build-Depends: debhelper (>= 7.0.50~),
+ quilt (>= 0.46-7~),
libdbus-glib-1-dev,
libssl-dev,
libpcsclite-dev,
@@ -12,8 +14,10 @@
libnl-dev [!kfreebsd-i386 !kfreebsd-amd64],
libpcap-dev [kfreebsd-i386 kfreebsd-amd64],
libbsd-dev [kfreebsd-i386 kfreebsd-amd64],
- pkg-config
-Standards-Version: 3.8.3
+ pkg-config,
+ qt4-qmake
+Build-Conflicts: libqt3-dev
+Standards-Version: 3.8.4
Vcs-Svn: svn://svn.debian.org/pkg-wpa/wpasupplicant/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/
Homepage: http://w1.fi/wpa_supplicant/
Modified: wpasupplicant/trunk/debian/ifupdown/functions.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/functions.sh?rev=1465&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/functions.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/functions.sh Thu Feb 11 03:58:49 2010
@@ -44,14 +44,11 @@
if [ -d /lib/init/rw/sendsigs.omit.d/ ]; then
# Debian
WPA_SUP_OMIT_PIDFILE="/lib/init/rw/sendsigs.omit.d/wpasupplicant.wpa_supplicant.${WPA_IFACE}.pid"
- WPA_CLI_OMIT_PIDFILE="/lib/init/rw/sendsigs.omit.d/wpasupplicant.wpa_action.${WPA_IFACE}.pid"
elif [ -d /var/run/sendsigs.omit.d/ ]; then
# Ubuntu, see https://launchpad.net/bugs/181541 for status
WPA_SUP_OMIT_PIDFILE="/var/run/sendsigs.omit.d/wpasupplicant.wpa_supplicant.${WPA_IFACE}.pid"
- WPA_CLI_OMIT_PIDFILE="/var/run/sendsigs.omit.d/wpasupplicant.wpa_action.${WPA_IFACE}.pid"
else
WPA_SUP_OMIT_PIDFILE=
- WPA_CLI_OMIT_PIDFILE=
fi
# default ctrl_interface socket directory
@@ -389,29 +386,6 @@
wpa_msg stderr "$WPA_CLI_BIN daemon failed to start"
return 1
fi
-
- if [ -n "$WPA_CLI_OMIT_PIDFILE" ]; then
- local WPA_PIDFILE_WAIT
- local MAX_WPA_PIDFILE_WAIT
- WPA_PIDFILE_WAIT="0"
- MAX_WPA_PIDFILE_WAIT="5"
- until [ -s "$WPA_CLI_PIDFILE" ]; do
- if [ "$WPA_PIDFILE_WAIT" -ge "$MAX_WPA_PIDFILE_WAIT" ]; then
- wpa_msg stderr "timed out waiting for creation of $WPA_CLI_PIDFILE"
- return 1
- else
- wpa_msg verbose "waiting for \"$WPA_CLI_PIDFILE\": " \
- "$WPA_PIDFILE_WAIT (max. $MAX_WPA_PIDFILE_WAIT)"
- fi
-
- WPA_PIDFILE_WAIT=$(($WPA_PIDFILE_WAIT + 1))
- sleep 1
- done
- wpa_msg verbose "creating sendsigs omission pidfile: $WPA_CLI_OMIT_PIDFILE"
- cat "$WPA_CLI_PIDFILE" > "$WPA_CLI_OMIT_PIDFILE"
- else
- wpa_msg verbose "sendsigs omission pidfile not created"
- fi
}
#####################################################################
@@ -429,10 +403,6 @@
if [ -f "$WPA_CLI_PIDFILE" ]; then
rm -f "$WPA_CLI_PIDFILE"
- fi
-
- if [ -f "$WPA_CLI_OMIT_PIDFILE" ]; then
- rm -f "$WPA_CLI_OMIT_PIDFILE"
fi
if [ -f "$WPA_CLI_TIMESTAMP" ]; then
@@ -1002,6 +972,9 @@
ifupdown_unlock
fi
+ wpa_msg log "creating sendsigs omission pidfile: $WPA_SUP_OMIT_PIDFILE"
+ cat "$WPA_SUP_PIDFILE" > "$WPA_SUP_OMIT_PIDFILE"
+
return "$IFUP_RETVAL"
}
@@ -1017,6 +990,9 @@
/sbin/ifdown -v "$WPA_IFACE"
ifupdown_unlock
+
+ wpa_msg log "removing sendsigs omission pidfile: $WPA_SUP_OMIT_PIDFILE"
+ rm -f "$WPA_SUP_OMIT_PIDFILE"
}
#####################################################################
Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1465&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Thu Feb 11 03:58:49 2010
@@ -1,6 +1,5 @@
01_use_pkg-config_for_pcsc-lite_module.patch
02_dbus_group_policy.patch
-05_qmake_version_makefile.patch
06_wpa_gui_menu_exec_path.patch
07_dbus_service_syslog.patch
11_syslog.patch
Modified: wpasupplicant/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/rules?rev=1465&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/rules (original)
+++ wpasupplicant/trunk/debian/rules Thu Feb 11 03:58:49 2010
@@ -2,32 +2,38 @@
CFLAGS = -MMD -Wall -g
LDFLAGS = -Wl,--as-needed
+V = 1
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
+ CXXFLAGS += -O0
else
CFLAGS += -O2
+ CXXFLAGS += -O2
endif
+
+export CFLAGS CXXFLAGS LDFLAGS V
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
BUILD_DOT_CONFIG := debian/config/$(DEB_HOST_ARCH_OS)
### start dh overrides
+override_dh_auto_configure:
+ cp --remove-destination $(BUILD_DOT_CONFIG) wpa_supplicant/.config
+ dh_auto_configure --sourcedirectory=wpa_supplicant/wpa_gui-qt4 \
+ --buildsystem=qmake
+
override_dh_auto_build:
- cp --remove-destination $(BUILD_DOT_CONFIG) wpa_supplicant/.config
- $(MAKE) -C wpa_supplicant all
- $(MAKE) -C wpa_supplicant wpa_gui-qt4
- #$(MAKE) -C wpa_supplicant/doc/docbook man
+ dh_auto_build --sourcedirectory=wpa_supplicant \
+ --buildsystem=makefile
+ dh_auto_build --sourcedirectory=wpa_supplicant/wpa_gui-qt4 \
+ --buildsystem=qmake
override_dh_auto_clean:
- $(MAKE) -C wpa_supplicant clean
- if [ -f wpa_supplicant/wpa_gui-qt4/Makefile ]; then \
- $(MAKE) -C wpa_supplicant/wpa_gui-qt4 distclean ; \
- fi
- #$(MAKE) -C wpa_supplicant/doc/docbook clean
-
-override_dh_auto_configure:
- $(info Skip dh_auto_configure ...)
+ dh_auto_clean --sourcedirectory=wpa_supplicant \
+ --buildsystem=makefile
+ dh_auto_clean --sourcedirectory=wpa_supplicant/wpa_gui-qt4 \
+ --buildsystem=qmake
override_dh_auto_install:
$(info Skip dh_auto_install ...)
@@ -37,8 +43,8 @@
override_dh_fixperms:
dh_fixperms
- chmod 0755 debian/wpagui/usr/share/wpagui/netdev_wrapper \
- debian/wpasupplicant/etc/wpa_supplicant/*.sh
+ chmod 0755 debian/wpasupplicant/etc/wpa_supplicant/*.sh
+ chmod 0755 debian/wpagui/usr/share/wpagui/netdev_wrapper
override_dh_install:
dh_install
@@ -49,10 +55,7 @@
override_dh_installchangelogs:
dh_installchangelogs wpa_supplicant/ChangeLog
-
-override_dh_installinit:
- dh_installinit --package=wpasupplicant --name=wpa-ifupdown --no-start -- start 15 0 6 .
### end dh overrides
%:
- dh $@
+ dh --with quilt $@
Modified: wpasupplicant/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/source/format?rev=1465&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/source/format (original)
+++ wpasupplicant/trunk/debian/source/format Thu Feb 11 03:58:49 2010
@@ -1,1 +1,1 @@
-3.0 (quilt)
+1.0
Modified: wpasupplicant/trunk/debian/wpasupplicant.postinst
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.postinst?rev=1465&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.postinst (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.postinst Thu Feb 11 03:58:49 2010
@@ -39,6 +39,10 @@
rm_conffile /etc/logrotate.d/wpa_supplicant
rm_conffile /etc/logrotate.d/wpa_action
fi
+ if dpkg --compare-versions "$2" lt "0.6.10-1"; then
+ rm_conffile /etc/init.d/wpa-ifupdown
+ update-rc.d -f wpa-ifupdown remove >/dev/null
+ fi
;;
abort-upgrade|abort-deconfigure|abort-remove)
;;
Modified: wpasupplicant/trunk/debian/wpasupplicant.postrm
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.postrm?rev=1465&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.postrm (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.postrm Thu Feb 11 03:58:49 2010
@@ -54,6 +54,9 @@
undo_rm_conffile /etc/logrotate.d/wpa_supplicant
undo_rm_conffile /etc/logrotate.d/wpa_action
fi
+ if dpkg --compare-versions "$2" lt "0.6.10-1"; then
+ undo_rm_conffile /etc/init.d/wpa-ifupdown
+ fi
;;
*)
echo "$0 called with unknown argument \`$1'" 1>&2
Modified: wpasupplicant/trunk/debian/wpasupplicant.preinst
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.preinst?rev=1465&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.preinst (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.preinst Thu Feb 11 03:58:49 2010
@@ -38,6 +38,9 @@
prep_rm_conffile wpasupplicant /etc/logrotate.d/wpa_supplicant
prep_rm_conffile wpasupplicant /etc/logrotate.d/wpa_action
fi
+ if dpkg --compare-versions "$2" lt "0.6.10-1"; then
+ prep_rm_conffile wpasupplicant /etc/init.d/wpa-ifupdown
+ fi
;;
abort-upgrade)
;;
More information about the Pkg-wpa-devel
mailing list