r335 - in /unstable/madwifi-tools/debian: changelog manpages patches/01_athstats_disable_hal_phy_errors.patch patches/02_fix_makefile_all_def.patch patches/series rules

kelmo-guest at users.alioth.debian.org kelmo-guest at users.alioth.debian.org
Sun Jun 1 12:07:36 UTC 2008 

Author: kelmo-guest
Date: Sun Jun  1 12:07:36 2008
New Revision: 335

URL: http://svn.debian.org/wsvn/pkg-madwifi/?sc=1&rev=335
Log:
* New upstream SVN snapshot.
* Add support to get-orig-source for SVN snapshot tarballs. [debian/rules]
* Adapt debian/patches/01_athstats_disable_hal_phy_errors.patch to upstream
  change.
* Add debian/patches/02_fix_makefile_all_def.patch to fix error in upstream
  Makefile.
* Handle new location of upstream ath_info. [debian/rules, debian/manpages]

Added:
    unstable/madwifi-tools/debian/patches/02_fix_makefile_all_def.patch
Modified:
    unstable/madwifi-tools/debian/changelog
    unstable/madwifi-tools/debian/manpages
    unstable/madwifi-tools/debian/patches/01_athstats_disable_hal_phy_errors.patch
    unstable/madwifi-tools/debian/patches/series
    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=335&op=diff
==============================================================================
--- unstable/madwifi-tools/debian/changelog (original)
+++ unstable/madwifi-tools/debian/changelog Sun Jun  1 12:07:36 2008
@@ -1,6 +1,6 @@
-madwifi-tools (1:0.9.4-1) unstable; urgency=low
+madwifi-tools (1:0.9.4+r3685.20080531+dfsg-1) unstable; urgency=low
 
-  * New upstream release.
+  * New upstream SVN snapshot.
   * Remove bogus install-stamp target. [debian/rules]
   * Remove suggests of wireless-tools, it is not useful. [debian/control]
   * Build-depend on debhelper >= 7. [debian/control, debian/compat]
@@ -11,8 +11,14 @@
   * Condense debian/manapages to one line with a wildcard.
   * Drop debian/patches/02_ath_info_manpage_warnings.patch, applied upstream.
   * Add brief comment to modprobe file about howto activate ath5k.
+  * Add support to get-orig-source for SVN snapshot tarballs. [debian/rules]
+  * Adapt debian/patches/01_athstats_disable_hal_phy_errors.patch to upstream
+    change.
+  * Add debian/patches/02_fix_makefile_all_def.patch to fix error in upstream
+    Makefile.
+  * Handle new location of upstream ath_info. [debian/rules, debian/manpages]
 
- -- Kel Modderman <kel at otaku42.de>  Fri, 30 May 2008 12:12:53 +1000
+ -- Kel Modderman <kel at otaku42.de>  Sun, 01 Jun 2008 22:05:06 +1000
 
 madwifi-tools (1:0.9.4~rc2+dfsg-1) unstable; urgency=low
 

Modified: unstable/madwifi-tools/debian/manpages
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi-tools/debian/manpages?rev=335&op=diff
==============================================================================
--- unstable/madwifi-tools/debian/manpages (original)
+++ unstable/madwifi-tools/debian/manpages Sun Jun  1 12:07:36 2008
@@ -1,1 +1,1 @@
-tools/man/*.8
+tools/*/*.8

Modified: 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=335&op=diff
==============================================================================
--- unstable/madwifi-tools/debian/patches/01_athstats_disable_hal_phy_errors.patch (original)
+++ unstable/madwifi-tools/debian/patches/01_athstats_disable_hal_phy_errors.patch Sun Jun  1 12:07:36 2008
@@ -6,21 +6,24 @@
 
 --- a/tools/athstats.c
 +++ b/tools/athstats.c
-@@ -57,9 +57,12 @@
- #include <err.h>
+@@ -58,7 +58,7 @@
+ 
+ /* We don't need the real TARGET.opt_ah.h */
+ #define OPT_AH_H <stdio.h>
+-#include "ah_desc.h"
++/* #include "ah_desc.h" XXX: DFSG */
  
  #include "wireless_copy.h"
--#include "ah_desc.h"
-+/* 
-+ * #include "ah_desc.h" not DFSG compat
-+ */
  #include "if_athioctl.h"
+@@ -66,6 +66,7 @@
+ #undef ARRAY_SIZE
+ #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
  
 +#if 0
  static const struct {
  	u_int		phyerr;
  	const char*	desc;
-@@ -84,6 +87,7 @@
+@@ -90,6 +91,7 @@
  	{ HAL_PHYERR_CCK_SERVICE,	"CCK illegal service" },
  	{ HAL_PHYERR_CCK_RESTART,	"CCK restart" },
  };
@@ -28,7 +31,7 @@
  
  static void
  printstats(FILE *fd, const struct ath_stats *stats)
-@@ -93,7 +97,7 @@
+@@ -98,7 +100,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)
@@ -37,15 +40,15 @@
  
  	STAT(watchdog, "watchdog timeouts");
  	STAT(hardware, "hardware error interrupts");
-@@ -135,6 +139,7 @@
+@@ -140,6 +142,7 @@
  		for (i = 0; i < 32; i++) {
  			if (stats->ast_rx_phy[i] == 0)
  				continue;
 +			#if 0
- 			for (j = 0; j < N(phyerrdescriptions); j++)
+ 			for (j = 0; j < ARRAY_SIZE(phyerrdescriptions); j++)
  				if (phyerrdescriptions[j].phyerr == i)
  					break;
-@@ -146,6 +151,10 @@
+@@ -151,6 +154,10 @@
  				fprintf(fd, "    %u %s\n",
  					stats->ast_rx_phy[i],
  					phyerrdescriptions[j].desc);

Added: unstable/madwifi-tools/debian/patches/02_fix_makefile_all_def.patch
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi-tools/debian/patches/02_fix_makefile_all_def.patch?rev=335&op=file
==============================================================================
--- unstable/madwifi-tools/debian/patches/02_fix_makefile_all_def.patch (added)
+++ unstable/madwifi-tools/debian/patches/02_fix_makefile_all_def.patch Sun Jun  1 12:07:36 2008
@@ -1,0 +1,20 @@
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -47,7 +47,7 @@
+ endif
+ 
+ 
+-PROGRAMS = athstats 80211stats athkey athchans athctrl \
++ALL = athstats 80211stats athkey athchans athctrl \
+ 	athdebug 80211debug wlanconfig wpakey
+ 
+ SUBDIRS = ath_info
+@@ -57,7 +57,7 @@
+ ALL_CFLAGS = $(CFLAGS) $(INCS)
+ LDFLAGS =
+ 
+-all: all-subdirs $(PROGRAMS)
++all: all-subdirs $(ALL)
+ 
+ all-subdirs:
+ 	for d in $(SUBDIRS); do \

Modified: unstable/madwifi-tools/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi-tools/debian/patches/series?rev=335&op=diff
==============================================================================
--- unstable/madwifi-tools/debian/patches/series (original)
+++ unstable/madwifi-tools/debian/patches/series Sun Jun  1 12:07:36 2008
@@ -1,1 +1,2 @@
 01_athstats_disable_hal_phy_errors.patch
+02_fix_makefile_all_def.patch

Modified: unstable/madwifi-tools/debian/rules
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi-tools/debian/rules?rev=335&op=diff
==============================================================================
--- unstable/madwifi-tools/debian/rules (original)
+++ unstable/madwifi-tools/debian/rules Sun Jun  1 12:07:36 2008
@@ -26,7 +26,10 @@
 	install -D -m 0755 tools/wlanconfig \
 		debian/madwifi-tools/sbin/wlanconfig
 	
-	for t in 80211debug 80211stats ath_info athchans athctrl athdebug \
+	install -D -m 0755 tools/ath_info/ath_info \
+		debian/madwifi-tools/usr/sbin/ath_info
+	
+	for t in 80211debug 80211stats athchans athctrl athdebug \
 		 athkey athstats; do \
 		install -D -m 0755 tools/$$t \
 			debian/madwifi-tools/usr/sbin/$$t; \
@@ -63,9 +66,16 @@
 # DFSG tarball variables
 DEBVERS := $(shell dpkg-parsechangelog | sed -n 's/^Version.*:\(.*\)-.*/\1/p')
 UPSVERS := $(shell echo $(DEBVERS) | cut -d'+' -f1 | tr '~' '-')
+SVNVERS := $(shell echo $(DEBVERS) | sed -n 's/.*+\([^+]\+\)+dfsg.*/\1/p' | tr '.' '-')
+ifneq "$(SVNVERS)" ""
+ORIGTAR := madwifi-trunk-$(SVNVERS).tar.gz
+ORIGDIR := madwifi-trunk-$(SVNVERS)
+ORIGURL := http://snapshots.madwifi.org/madwifi-trunk/
+else
 ORIGTAR := madwifi-$(UPSVERS).tar.gz
 ORIGDIR := madwifi-$(UPSVERS)
 ORIGURL := http://optusnet.dl.sourceforge.net/sourceforge/madwifi/
+endif
 DFSGDIR := madwifi-tools-$(DEBVERS)
 DFSGTAR := madwifi-tools_$(DEBVERS).orig.tar.gz

More information about the Pkg-madwifi-maintainers mailing list