r264 - in /experimental/madwifi-tools/debian: changelog
patches/01_athstats_disable_hal_phy_errors.dpatch rules
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Thu May 10 10:43:06 UTC 2007
Author: kelmo-guest
Date: Thu May 10 10:43:05 2007
New Revision: 264
URL: http://svn.debian.org/wsvn/pkg-madwifi/?sc=1&rev=264
Log:
* NOT RELEASED YET.
* New upstream snapshot based on experimental madwifi-hal-0.9.30.13 branch.
* Add upstream branch variable to get-orig-source target. [debian/rules]
* Refresh debian/patches/01_athstats_disable_hal_phy_errors.dpatch.
Modified:
experimental/madwifi-tools/debian/changelog
experimental/madwifi-tools/debian/patches/01_athstats_disable_hal_phy_errors.dpatch
experimental/madwifi-tools/debian/rules
Modified: experimental/madwifi-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-madwifi/experimental/madwifi-tools/debian/changelog?rev=264&op=diff
==============================================================================
--- experimental/madwifi-tools/debian/changelog (original)
+++ experimental/madwifi-tools/debian/changelog Thu May 10 10:43:05 2007
@@ -1,3 +1,12 @@
+madwifi-tools (1:0.9.3+r2310.20070509+dfsg-1) experimental; urgency=low
+
+ * NOT RELEASED YET.
+ * New upstream snapshot based on experimental madwifi-hal-0.9.30.13 branch.
+ * Add upstream branch variable to get-orig-source target. [debian/rules]
+ * Refresh debian/patches/01_athstats_disable_hal_phy_errors.dpatch.
+
+ -- Kel Modderman <kel at otaku42.de> Thu, 10 May 2007 20:40:13 +1000
+
madwifi-tools (1:0.9.3+dfsg-1) unstable; urgency=low
* New upstream release.
Modified: experimental/madwifi-tools/debian/patches/01_athstats_disable_hal_phy_errors.dpatch
URL: http://svn.debian.org/wsvn/pkg-madwifi/experimental/madwifi-tools/debian/patches/01_athstats_disable_hal_phy_errors.dpatch?rev=264&op=diff
==============================================================================
--- experimental/madwifi-tools/debian/patches/01_athstats_disable_hal_phy_errors.dpatch (original)
+++ experimental/madwifi-tools/debian/patches/01_athstats_disable_hal_phy_errors.dpatch Thu May 10 10:43:05 2007
@@ -6,24 +6,26 @@
## DP: Contributed by Pavel Roskin
@DPATCH@
-diff -Nrup madwifi-0.9.2/tools/athstats.c madwifi-0.9.2-athstats-phyerr/tools/athstats.c
---- madwifi-0.9.2/tools/athstats.c 2006-05-05 14:20:50.000000000 +1000
-+++ madwifi-0.9.2-athstats-phyerr/tools/athstats.c 2006-09-15 10:03:39.000000000 +1000
-@@ -61,9 +61,12 @@
- #define __user
+diff -Nrup madwifi-tools-0.9.3+r2310.20070509/tools/athstats.c madwifi-tools-0.9.3+r2310.20070509+dfsg/tools/athstats.c
+--- madwifi-tools-0.9.3+r2310.20070509/tools/athstats.c 2007-03-27 11:44:05.000000000 +1000
++++ madwifi-tools-0.9.3+r2310.20070509+dfsg/tools/athstats.c 2007-05-10 20:37:14.000000000 +1000
+@@ -58,11 +58,14 @@
+
+ /* We don't need the real TARGET.opt_ah.h */
+ #define OPT_AH_H <stdio.h>
+-#include "ah_desc.h"
++/*
++ * #include "ah_desc.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;
-@@ -88,6 +91,7 @@ static const struct {
+@@ -87,6 +90,7 @@ static const struct {
{ HAL_PHYERR_CCK_SERVICE, "CCK illegal service" },
{ HAL_PHYERR_CCK_RESTART, "CCK restart" },
};
@@ -31,7 +33,7 @@
static void
printstats(FILE *fd, const struct ath_stats *stats)
-@@ -97,7 +101,7 @@ printstats(FILE *fd, const struct ath_st
+@@ -96,7 +100,7 @@ printstats(FILE *fd, const struct ath_st
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)
@@ -40,7 +42,7 @@
STAT(watchdog, "watchdog timeouts");
STAT(hardware, "hardware error interrupts");
-@@ -139,6 +143,7 @@ printstats(FILE *fd, const struct ath_st
+@@ -138,6 +142,7 @@ printstats(FILE *fd, const struct ath_st
for (i = 0; i < 32; i++) {
if (stats->ast_rx_phy[i] == 0)
continue;
@@ -48,7 +50,7 @@
for (j = 0; j < N(phyerrdescriptions); j++)
if (phyerrdescriptions[j].phyerr == i)
break;
-@@ -150,6 +155,10 @@ printstats(FILE *fd, const struct ath_st
+@@ -149,6 +154,10 @@ printstats(FILE *fd, const struct ath_st
fprintf(fd, " %u %s\n",
stats->ast_rx_phy[i],
phyerrdescriptions[j].desc);
Modified: experimental/madwifi-tools/debian/rules
URL: http://svn.debian.org/wsvn/pkg-madwifi/experimental/madwifi-tools/debian/rules?rev=264&op=diff
==============================================================================
--- experimental/madwifi-tools/debian/rules (original)
+++ experimental/madwifi-tools/debian/rules Thu May 10 10:43:05 2007
@@ -13,9 +13,10 @@
SNAPVERS := $(shell echo $(DEBVERS) | sed -n 's/.*+\(.*\)+dfsg.*/\1/p')
ifneq "$(SNAPVERS)" ""
SVNVERS := $(shell echo $(SNAPVERS) | sed -n 's/\./-/p')
-UPSTAR := madwifi-ng-$(SVNVERS).tar.gz
-ORIGDIR := madwifi-ng-$(SVNVERS)
-UPSURL := http://snapshots.madwifi.org/madwifi-ng/$(UPSTAR)
+UPBRAN := hal-0.9.30.13
+UPSTAR := madwifi-$(UPBRAN)-$(SVNVERS).tar.gz
+ORIGDIR := madwifi-$(UPBRAN)-$(SVNVERS)
+UPSURL := http://snapshots.madwifi.org/madwifi-$(UPBRAN)/$(UPSTAR)
else
UPSTAR := madwifi-$(UPSVERS).tar.gz
ORIGDIR := madwifi-$(UPSVERS)
More information about the Pkg-madwifi-maintainers
mailing list