-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi,
Fixed some small changes like suggested on the mentors.debian.net mailinglist. I added a debdiff file. Regards, Martijn van Brummelen -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Use GnuPG with Firefox : http://getfiregpg.org (Version: 0.7.9) iEYEARECAAYFAkr6tQcACgkQ4yGTtsQpvi/OSwCfZe+hQUo3ds63Odwpsh7VYHdg r9MAnia0NJu+nse/FliVt35kl0jhdAvR =lVxh -----END PGP SIGNATURE-----
diff -u acx100-20080210/debian/control acx100-20080210/debian/control --- acx100-20080210/debian/control +++ acx100-20080210/debian/control @@ -2,13 +2,14 @@ Section: contrib/net Priority: extra Build-Depends: debhelper (>= 5.0), dpatch +Build-Depends-Indep: cpio Maintainer: Stefano Canepa <s...@linux.it> Standards-Version: 3.8.1 Homepage: http://acx100.sourceforge.net/ Package: acx100-source Architecture: all -Depends: debhelper (>= 5.0), module-assistant +Depends: debhelper (>= 5.0), module-assistant, dpatch Description: ACX100/ACX111 wireless network drivers source This package provides the source code of the Linux drivers for wireless network cards using TI ACX100/ACX111 chips. This includes DWL-[G]520+ diff -u acx100-20080210/debian/changelog acx100-20080210/debian/changelog --- acx100-20080210/debian/changelog +++ acx100-20080210/debian/changelog @@ -1,3 +1,13 @@ +acx100 (20080210-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Added cpio to Build-Depends-Indep + * Added dpatch to Depends (Closes: #534265) + * Added 02_irqreturn_t_fix.dpatch (Closes: #545367) + * Added 03_typo_fix.dpatch (Closes: #498099) + + -- Martijn van Brummelen <mart...@brumit.nl> Wed, 11 Nov 2009 06:18:47 +0100 + acx100 (20080210-1) unstable; urgency=low * New upstream release (20080210) (Closes: #490854) diff -u acx100-20080210/debian/patches/00list acx100-20080210/debian/patches/00list --- acx100-20080210/debian/patches/00list +++ acx100-20080210/debian/patches/00list @@ -1 +1,5 @@ -01_addRequestInfo.dpatch \ No newline at end of file +01_addRequestInfo.dpatch +# Closed 545367 +02_fix_irqreturn_t.dpatch +# Closes 498099 +03_typo_fix.dpatch only in patch2: unchanged: --- acx100-20080210.orig/debian/patches/03_typo_fix.dpatch +++ acx100-20080210/debian/patches/03_typo_fix.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_typo_fix.dpatch by Martijn van Brummelen <mart...@brumit.nl> +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes several small typo's (Closes: 498099) + +...@dpatch@ +diff -urNad acx100-20080210~/script/fetch_firmware.sh acx100-20080210/script/fetch_firmware.sh +--- acx100-20080210~/script/fetch_firmware.sh 2008-02-10 21:06:42.000000000 +0100 ++++ acx100-20080210/script/fetch_firmware.sh 2009-11-05 12:46:37.000000000 +0100 +@@ -15,8 +15,8 @@ + find_driver_dir() + { + ACXDIR=`pwd` +- [ -f $ACXDIR/scripts/start_nets.sh ] && return +- if [ -f $ACXDIR/../scripts/start_net.sh ]; then ++ [ -f $ACXDIR/script/start_net.sh ] && return ++ if [ -f $ACXDIR/../script/start_net.sh ]; then + ACXDIR="$ACXDIR/.." + return + fi +diff -urNad acx100-20080210~/script/inject_kernel_tree.sh acx100-20080210/script/inject_kernel_tree.sh +--- acx100-20080210~/script/inject_kernel_tree.sh 2008-02-10 21:06:42.000000000 +0100 ++++ acx100-20080210/script/inject_kernel_tree.sh 2009-11-05 12:47:55.000000000 +0100 +@@ -31,7 +31,7 @@ + } + + print "- Checking acx sources...\n"; +-my $kernel_help = "$from_dir/scripts/kernel_help"; ++my $kernel_help = "$from_dir/script/kernel_help"; + if (!-e "$from_dir/src") { + print "*** $from_dir/src doesn't exist!\n"; + exit 1; only in patch2: unchanged: --- acx100-20080210.orig/debian/patches/02_fix_irqreturn_t.dpatch +++ acx100-20080210/debian/patches/02_fix_irqreturn_t.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_fix_irqreturn_t.dpatch by Martijn van Brummelen <mart...@brumit.nl> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix for compiling the module (Closes: 545367) + +...@dpatch@ +diff -urNad acx100-20080210~/wlan_compat.h acx100-20080210/wlan_compat.h +--- acx100-20080210~/wlan_compat.h 2008-02-10 21:06:42.000000000 +0100 ++++ acx100-20080210/wlan_compat.h 2009-11-05 10:07:50.000000000 +0100 +@@ -218,7 +218,7 @@ + #define WLAN_PACKED __attribute__ ((packed)) + + /* Interrupt handler backwards compatibility stuff */ +-#ifndef IRQ_NONE ++#if (! (defined(_LINUX_IRQRETURN_H) || defined(IRQ_NONE))) + #define IRQ_NONE + #define IRQ_HANDLED + typedef void irqreturn_t;
