r306 - in /unstable/madwifi-tools/debian: changelog control dirs madwifi-tools.modprobe patches/00list patches/01_athstats_disable_hal_phy_errors.dpatch patches/01_athstats_disable_hal_phy_errors.patch patches/series rules
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Thu Jan 31 11:49:07 UTC 2008
Author: kelmo-guest
Date: Thu Jan 31 11:49:07 2008
New Revision: 306
URL: http://svn.debian.org/wsvn/pkg-madwifi/?sc=1&rev=306
Log:
* Convert debian/rules to debhelper only from cdbs. Drop build dependency on
cdbs. [debian/control, debian/rules]
* debian/dirs is no longer required, adjust installation of file in install
target of debian/rules to create directories as required. [debian/dirs,
debian/rules]
* Convert dpatch patch system to quilt. Build depnd on quilt.
* Update Standards Version to 3.7.3.
* Add debian/madwifi-tools.modprobe to provide module blacklist, and allow
madwifi to operate when installed alongside an ath5k kernel module when
this package is installed (and is a hard dependency of
madwifi-modules-_KVERS_). [debian/madwifi-tools.modprobe]
Added:
unstable/madwifi-tools/debian/madwifi-tools.modprobe
unstable/madwifi-tools/debian/patches/01_athstats_disable_hal_phy_errors.patch
unstable/madwifi-tools/debian/patches/series
- copied, changed from r301, unstable/madwifi-tools/debian/patches/00list
Removed:
unstable/madwifi-tools/debian/dirs
unstable/madwifi-tools/debian/patches/00list
unstable/madwifi-tools/debian/patches/01_athstats_disable_hal_phy_errors.dpatch
Modified:
unstable/madwifi-tools/debian/changelog
unstable/madwifi-tools/debian/control
unstable/madwifi-tools/debian/rules
Modified: unstable/madwifi-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi-tools/debian/changelog?rev=306&op=diff
==============================================================================
--- unstable/madwifi-tools/debian/changelog (original)
+++ unstable/madwifi-tools/debian/changelog Thu Jan 31 11:49:07 2008
@@ -1,3 +1,20 @@
+madwifi-tools (1:0.9.3+dfsg-4) UNRELEASED; urgency=low
+
+ * Convert debian/rules to debhelper only from cdbs. Drop build dependency on
+ cdbs. [debian/control, debian/rules]
+ * debian/dirs is no longer required, adjust installation of file in install
+ target of debian/rules to create directories as required. [debian/dirs,
+ debian/rules]
+ * Convert dpatch patch system to quilt. Build depnd on quilt.
+ [debian/patches/*]
+ * Update Standards Version to 3.7.3.
+ * Add debian/madwifi-tools.modprobe to provide module blacklist, and allow
+ madwifi to operate when installed alongside an ath5k kernel module when
+ this package is installed (and is a hard dependency of
+ madwifi-modules-_KVERS_). [debian/madwifi-tools.modprobe]
+
+ -- Kel Modderman <kel at otaku42.de> Thu, 31 Jan 2008 21:47:13 +1000
+
madwifi-tools (1:0.9.3+dfsg-3) unstable; urgency=low
* Install ifupdown hooks to /etc/network/if-pre-up.d/050madwifi and
Modified: unstable/madwifi-tools/debian/control
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi-tools/debian/control?rev=306&op=diff
==============================================================================
--- unstable/madwifi-tools/debian/control (original)
+++ unstable/madwifi-tools/debian/control Thu Jan 31 11:49:07 2008
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian madwifi team <pkg-madwifi-maintainers at lists.alioth.debian.org>
Uploaders: Loic Minier <lool at dooz.org>, Kel Modderman <kel at otaku42.de>, Matt Brown <debian at mattb.net.nz>, Alex Wallis <awol at otaku42.de>
-Build-Depends: cdbs, debhelper (>= 5), dpatch
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5), quilt
+Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/pkg-madwifi/unstable/madwifi-tools
Vcs-Browser: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi-tools/
Homepage: http://madwifi.org/
Added: unstable/madwifi-tools/debian/madwifi-tools.modprobe
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi-tools/debian/madwifi-tools.modprobe?rev=306&op=file
==============================================================================
--- unstable/madwifi-tools/debian/madwifi-tools.modprobe (added)
+++ unstable/madwifi-tools/debian/madwifi-tools.modprobe Thu Jan 31 11:49:07 2008
@@ -1,0 +1,17 @@
+## ath5k (mac80211)
+blacklist ath5k
+
+## madwifi (non-free)
+#blacklist ath_hal
+#blacklist ath_pci
+#blacklist ath_rate_amrr
+#blacklist ath_rate_onoe
+#blacklist ath_rate_sample
+#blacklist wlan
+#blacklist wlan_acl
+#blacklist wlan_ccmp
+#blacklist wlan_scan_ap
+#blacklist wlan_scan_sta
+#blacklist wlan_tkip
+#blacklist wlan_wep
+#blacklist wlan_xauth
Added: unstable/madwifi-tools/debian/patches/01_athstats_disable_hal_phy_errors.patch
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi-tools/debian/patches/01_athstats_disable_hal_phy_errors.patch?rev=306&op=file
==============================================================================
--- unstable/madwifi-tools/debian/patches/01_athstats_disable_hal_phy_errors.patch (added)
+++ unstable/madwifi-tools/debian/patches/01_athstats_disable_hal_phy_errors.patch Thu Jan 31 11:49:07 2008
@@ -1,0 +1,58 @@
+athstats_disable_hal_phy_errors.patch by Kel Modderman <kelrin at tpg.com.au>
+
+Disable inclusion of HAL_PHYERR_* via the non-free ah_desc.h header
+Contributed by Pavel Roskin
+---
+
+--- a/tools/athstats.c
++++ b/tools/athstats.c
+@@ -57,9 +57,12 @@
+ #include <err.h>
+
+ #include "wireless_copy.h"
+-#include "ah_desc.h"
++/*
++ * #include "ah_desc.h" not DFSG compat
++ */
+ #include "if_athioctl.h"
+
++#if 0
+ static const struct {
+ u_int phyerr;
+ const char* desc;
+@@ -84,6 +87,7 @@
+ { HAL_PHYERR_CCK_SERVICE, "CCK illegal service" },
+ { HAL_PHYERR_CCK_RESTART, "CCK restart" },
+ };
++#endif
+
+ static void
+ printstats(FILE *fd, const struct ath_stats *stats)
+@@ -93,7 +97,7 @@
+ if (stats->ast_##x) fprintf(fd, "%u " fmt "\n", stats->ast_##x)
+ #define STATI(x,fmt) \
+ if (stats->ast_##x) fprintf(fd, "%d " fmt "\n", stats->ast_##x)
+- int i, j;
++ int i;
+
+ STAT(watchdog, "watchdog timeouts");
+ STAT(hardware, "hardware error interrupts");
+@@ -135,6 +139,7 @@
+ for (i = 0; i < 32; i++) {
+ if (stats->ast_rx_phy[i] == 0)
+ continue;
++ #if 0
+ for (j = 0; j < N(phyerrdescriptions); j++)
+ if (phyerrdescriptions[j].phyerr == i)
+ break;
+@@ -146,6 +151,10 @@
+ fprintf(fd, " %u %s\n",
+ stats->ast_rx_phy[i],
+ phyerrdescriptions[j].desc);
++ #endif
++ fprintf(fd,
++ " %u (phy error code %u)\n",
++ stats->ast_rx_phy[i], i);
+ }
+ }
+ STAT(be_nobuf, "no skbuff available for beacon");
Copied: unstable/madwifi-tools/debian/patches/series (from r301, unstable/madwifi-tools/debian/patches/00list)
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi-tools/debian/patches/series?rev=306&op=diff
==============================================================================
--- unstable/madwifi-tools/debian/patches/00list (original)
+++ unstable/madwifi-tools/debian/patches/series Thu Jan 31 11:49:07 2008
@@ -1,1 +1,1 @@
-01_athstats_disable_hal_phy_errors
+01_athstats_disable_hal_phy_errors.patch
Modified: unstable/madwifi-tools/debian/rules
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi-tools/debian/rules?rev=306&op=diff
==============================================================================
--- unstable/madwifi-tools/debian/rules (original)
+++ unstable/madwifi-tools/debian/rules Thu Jan 31 11:49:07 2008
@@ -1,11 +1,66 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/cdbs/1/rules/utils.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
-DEB_MAKE_INVOKE = $(MAKE) -C tools
+include /usr/share/quilt/quilt.make
+
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
+ dh_testdir
+
+ $(MAKE) -C tools
+
+ touch @
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ dh_clean build-stamp install-stamp
+
+install: build install-stamp
+install-stamp:
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+
+ install -D -m 0755 tools/wlanconfig \
+ debian/madwifi-tools/sbin/wlanconfig
+
+ for t in 80211debug 80211stats athchans athctrl athdebug athkey athstats; do \
+ install -D -m 0755 tools/$$t \
+ debian/madwifi-tools/usr/sbin/$$t; \
+ done
+
+ install -D -m 0755 debian/pre-up \
+ debian/madwifi-tools/etc/network/if-pre-up.d/050madwifi
+ install -D -m 0755 debian/post-down \
+ debian/madwifi-tools/etc/network/if-post-down.d/z50madwifi
+
+ touch @
+
+binary-arch:
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ dh_install
+ dh_installman
+ dh_installmodules
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary-indep: build install
+# We have nothing to do by default.
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary
# DFSG tarball variables
DEBVERS := $(shell dpkg-parsechangelog | sed -n 's/^Version.*:\(.*\)-.*/\1/p')
@@ -23,19 +78,6 @@
endif
DFSGDIR := madwifi-tools-$(DEBVERS)
DFSGTAR := madwifi-tools_$(DEBVERS).orig.tar.gz
-
-install/madwifi-tools::
- # may be required in early boot
- install -m 0755 tools/wlanconfig debian/madwifi-tools/sbin/
- # auxiliary tools
- for t in 80211debug 80211stats athchans athctrl athdebug athkey athstats; do \
- install -m 0755 tools/$$t debian/madwifi-tools/usr/sbin/; \
- done
- # ifupdown helper scripts
- install -D -m 0755 debian/pre-up \
- debian/madwifi-tools/etc/network/if-pre-up.d/050madwifi
- install -D -m 0755 debian/post-down \
- debian/madwifi-tools/etc/network/if-post-down.d/z50madwifi
get-orig-source:
@dh_testdir
More information about the Pkg-madwifi-maintainers
mailing list