r303 - in /unstable/madwifi/debian: changelog control patches/00list patches/01_mips-compile-flags-fix.patch patches/02_get-arch-mk-x86.patch patches/11_mips-compile-flags-fix.dpatch patches/series rules

Thu Jan 31 10:03:33 UTC 2008

Author: kelmo-guest
Date: Thu Jan 31 10:03:33 2008
New Revision: 303

URL: http://svn.debian.org/wsvn/pkg-madwifi/?sc=1&rev=303
Log:
* Convert to quilt patch system from dpatch. Rename debian/patches/00list to
  debian/patches/series. Depend on quilt and not dpatch. [debian/patches/*,
  debian/control, debian/rules]
* Add debian/patches/02_get-arch-mk-x86.patch to fix failure to build
  against linux-headers-2.6.24-*. (Closes: #463353)

Added:
    unstable/madwifi/debian/patches/01_mips-compile-flags-fix.patch
    unstable/madwifi/debian/patches/02_get-arch-mk-x86.patch
    unstable/madwifi/debian/patches/series
      - copied, changed from r302, unstable/madwifi/debian/patches/00list
Removed:
    unstable/madwifi/debian/patches/00list
    unstable/madwifi/debian/patches/11_mips-compile-flags-fix.dpatch
Modified:
    unstable/madwifi/debian/changelog
    unstable/madwifi/debian/control
    unstable/madwifi/debian/rules

Modified: unstable/madwifi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/changelog?rev=303&op=diff
==============================================================================

--- unstable/madwifi/debian/changelog (original)
+++ unstable/madwifi/debian/changelog Thu Jan 31 10:03:33 2008
@@ -1,4 +1,4 @@
-madwifi (1:0.9.4~svnr3122-1) UNRELEASED; urgency=low
+madwifi (1:0.9.4~rc1-1) unstable; urgency=low
 
   * New upstream release candidate.
   * Drop all patches applied upstream.
@@ -7,8 +7,13 @@
     - debian/patches/14_fix-2.6.24-inet-net-proc-net.dpatch
     - debian/patches/12_fix-2.6.23-include-fs-h.dpatch
   * Bump Standards Version to 3.7.3, no extra changes required.
-
- -- Kel Modderman <kel at otaku42.de>  Thu, 03 Jan 2008 21:51:49 +1000
+  * Convert to quilt patch system from dpatch. Rename debian/patches/00list to
+    debian/patches/series. Depend on quilt and not dpatch. [debian/patches/*,
+    debian/control, debian/rules]
+  * Add debian/patches/02_get-arch-mk-x86.patch to fix failure to build
+    against linux-headers-2.6.24-*. (Closes: #463353)
+
+ -- Kel Modderman <kel at otaku42.de>  Thu, 31 Jan 2008 19:59:05 +1000
 
 madwifi (1:0.9.3.2-2) unstable; urgency=high
 

Modified: unstable/madwifi/debian/control
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/control?rev=303&op=diff
==============================================================================
--- unstable/madwifi/debian/control (original)
+++ unstable/madwifi/debian/control Thu Jan 31 10:03:33 2008
@@ -3,7 +3,7 @@
 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 <mattb at debian.org>, Alex Wallis <awol at otaku42.de>
-Build-Depends: cdbs, debhelper (>= 5.0.37), bzip2, dpatch
+Build-Depends: cdbs, debhelper (>= 5.0.37), bzip2, quilt
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/pkg-madwifi/unstable/madwifi
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/

Added: unstable/madwifi/debian/patches/01_mips-compile-flags-fix.patch
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/01_mips-compile-flags-fix.patch?rev=303&op=file
==============================================================================
--- unstable/madwifi/debian/patches/01_mips-compile-flags-fix.patch (added)
+++ unstable/madwifi/debian/patches/01_mips-compile-flags-fix.patch Thu Jan 31 10:03:33 2008
@@ -1,0 +1,30 @@
+mips-compile-flags-fix.patch by Aurelien Jarno <aurel32 at debian.org>
+
+madwifi fails to build on MIPS32 CPU due to a bug in the build system.
+On those systems, the -mips1 option is passed to GCC, which conflicts
+with the -mips32 option passed by the kernel build system.
+
+Also the -EL or -EB options are issuing warnings, as they are only
+available on the other endianess system (-EL is available on mips, -EB
+on mipsel). The default endianess is sane, there is no need to force it,
+and anyway the kernel build system already handle that.
+---
+
+--- a/hal/public/mips1-be-elf.inc
++++ b/hal/public/mips1-be-elf.inc
+@@ -68,5 +68,5 @@
+ 
+ LDOPTS=	-EB
+ COPTS+=	-DAH_BYTE_ORDER=AH_BIG_ENDIAN
+-COPTS+=	-G 0 -EB -mno-abicalls -fno-pic -mips1 -Wa,--trap \
++COPTS+=	-G 0 -mno-abicalls -fno-pic -Wa,--trap \
+ 	-fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls
+--- a/hal/public/mips1-le-elf.inc
++++ b/hal/public/mips1-le-elf.inc
+@@ -68,5 +68,5 @@
+ 
+ LDOPTS=	-EL
+ COPTS+=	-DAH_BYTE_ORDER=AH_LITTLE_ENDIAN
+-COPTS+=	-G 0 -EL -mno-abicalls -fno-pic -mips1 -Wa,--trap \
++COPTS+=	-G 0 -mno-abicalls -fno-pic -Wa,--trap \
+ 	-fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls

Added: unstable/madwifi/debian/patches/02_get-arch-mk-x86.patch
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/02_get-arch-mk-x86.patch?rev=303&op=file
==============================================================================
--- unstable/madwifi/debian/patches/02_get-arch-mk-x86.patch (added)
+++ unstable/madwifi/debian/patches/02_get-arch-mk-x86.patch Thu Jan 31 10:03:33 2008
@@ -1,0 +1,17 @@
+--- a/scripts/get_arch.mk
++++ b/scripts/get_arch.mk
+@@ -40,6 +40,14 @@
+ ifeq (,$(ARCH))
+ ARCH = $(ARCH-y)
+ else
++ifeq ($(filter-out x86,$(ARCH)),)
++ifeq (x86_64,$(ARCH-y))
++ARCH = $(ARCH-y)
++endif
++ifeq (i386,$(ARCH-y))
++ARCH = $(ARCH-y)
++endif
++endif
+ ifneq ($(ARCH),$(ARCH-y))
+ $(error ARCH mismatch: supplied "$(ARCH)", determined "$(ARCH-y)")
+ endif

Copied: unstable/madwifi/debian/patches/series (from r302, unstable/madwifi/debian/patches/00list)
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/series?rev=303&op=diff
==============================================================================
--- unstable/madwifi/debian/patches/00list (original)
+++ unstable/madwifi/debian/patches/series Thu Jan 31 10:03:33 2008
@@ -1,1 +1,2 @@
-11_mips-compile-flags-fix
+01_mips-compile-flags-fix.patch
+02_get-arch-mk-x86.patch

Modified: unstable/madwifi/debian/rules
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/rules?rev=303&op=diff
==============================================================================
--- unstable/madwifi/debian/rules (original)
+++ unstable/madwifi/debian/rules Thu Jan 31 10:03:33 2008
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_INSTALL_DOCS_ALL := -XTHANKS
 


