r359 - in /unstable/madwifi/debian: changelog control copyright patches/ rules
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Fri Aug 29 16:05:15 UTC 2008
Author: kelmo-guest
Date: Fri Aug 29 16:05:15 2008
New Revision: 359
URL: http://svn.debian.org/wsvn/pkg-madwifi/?sc=1&rev=359
Log:
* New upstream SVN snapshot.
- new HAl version 2008-08-15 produced in co-operative effort by
OpenWrt.org, DD-WRT and MakSat Technologies (P) Ltd.
* Use dh in all debian/rules targets.
* Drop debian/patches/*, no longer apply to new upstream. Disable quilt
patchsys.
* Update and convert debian/copyright to new proposed parsable format.
Removed:
unstable/madwifi/debian/patches/
Modified:
unstable/madwifi/debian/changelog
unstable/madwifi/debian/control
unstable/madwifi/debian/copyright
unstable/madwifi/debian/rules
Modified: unstable/madwifi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/changelog?rev=359&op=diff
==============================================================================
--- unstable/madwifi/debian/changelog (original)
+++ unstable/madwifi/debian/changelog Fri Aug 29 16:05:15 2008
@@ -1,24 +1,14 @@
-madwifi (1:0.9.4.0-1) unstable; urgency=low
-
- * Revert to 0.9.4 codebase. Reopens #434702, #414998, which were demands for
- better hardware support. Sorry, but the hardware support came at the
- expense of wrecking existing setups for quite a few people.
- (Closes: #492251, #491731, #491738)
- * Backport patches from 0.9.4 branch of upstream, containing compat fixes
- for new releases of Linux (2.6.26 and 2.6.27).
- - 10_changeset_r3696.patch
- - 11_changeset_r3715.patch
- - 12_changeset_r3811.patch
- * Backport a few misc fixes from upstream trunk. See each patch header for
- details. These may become candidates for next dot point 0.9.4 release.
- - 20_changeset_r3770.patch
- - 21_changeset_r3724.patch
- - 22_changeset_r3726.patch
- - 23_changeset_r3699.patch
- - 24_changeset_r3751.patch
- * Remove call to dh_testroot in clean target of debian/rules.
-
- -- Kel Modderman <kel at otaku42.de> Sat, 26 Jul 2008 00:17:33 +1000
+madwifi (1:0.9.4+r3851.20080829-1) experimental; urgency=low
+
+ * New upstream SVN snapshot.
+ - new HAl version 2008-08-15 produced in co-operative effort by
+ OpenWrt.org, DD-WRT and MakSat Technologies (P) Ltd.
+ * Use dh in all debian/rules targets.
+ * Drop debian/patches/*, no longer apply to new upstream. Disable quilt
+ patchsys.
+ * Update and convert debian/copyright to new proposed parsable format.
+
+ -- Kel Modderman <kel at otaku42.de> Sat, 30 Aug 2008 02:03:57 +1000
madwifi (1:0.9.4+r3772.20080716-1) unstable; urgency=low
Modified: unstable/madwifi/debian/control
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/control?rev=359&op=diff
==============================================================================
--- unstable/madwifi/debian/control (original)
+++ unstable/madwifi/debian/control Fri Aug 29 16:05:15 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>, Matthew W.S.Bell <mentor at madwifi.org>
-Build-Depends: debhelper (>= 7), bzip2, quilt
+Build-Depends: debhelper (>= 7), bzip2
Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/pkg-madwifi/unstable/madwifi
Vcs-Browser: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/
Modified: unstable/madwifi/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/copyright?rev=359&op=diff
==============================================================================
--- unstable/madwifi/debian/copyright (original)
+++ unstable/madwifi/debian/copyright Fri Aug 29 16:05:15 2008
@@ -1,150 +1,110 @@
-This package was debianized by Kel Modderman <kelrin at tpg.com.au> on
-Wed, 26 Oct 2005 21:07:13 +1000.
+Upstream-Name: madwifi
+Upstream-Source: http://madwifi.org/wiki/UserDocs/GettingMadwifi
-It was downloaded from <http://madwifi.org/>.
+Files: hal/*
+Copyright: Copyright (c) 2002-2008 Sam Leffler, Errno Consulting, Atheros
+ Communications, Inc. All rights reserved.
+License: Other
+ All files contained in this distribution are covered by the following
+ copyright unless explicitly identified otherwise. Note that this
+ copyright does _NOT_ contain a "or GPL" clause and does _NOT_ permit
+ redistribution with changes.
-Most files are distributed under a dual license, the first being GPL v2, the
-second being BSD alike.
+ /*-
+ * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting, Atheros
+ * Communications, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the following conditions are met:
+ * 1. The materials contained herein are unmodified and are used
+ * unmodified.
+ * 2. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following NO
+ * ''WARRANTY'' disclaimer below (''Disclaimer''), without
+ * modification.
+ * 3. Redistributions in binary form must reproduce at minimum a
+ * disclaimer similar to the Disclaimer below and any redistribution
+ * must be conditioned upon including a substantially similar
+ * Disclaimer requirement for further binary redistribution.
+ * 4. Neither the names of the above-listed copyright holders nor the
+ * names of any contributors may be used to endorse or promote
+ * product derived from this software without specific prior written
+ * permission.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT,
+ * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE
+ * FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGES.
+ *
+ * $Id: //depot/sw/branches/sam_hal/COPYRIGHT#2 $
+ */
-On Debian GNU/Linux systems, the text of the GPL license can be found in
-/usr/share/common-licenses/GPL and the text of the BSD license in the same
-directory.
+Files: net80211/ieee80211_linux.*, net80211/if_media.*,
+ net80211/ieee80211_radiotap.h, net80211/rc4.*,
+ include/sys/queue.h
+Copyright: Copyright (c) 1997 Jonathan Stone and Jason R. Thorpe.
+ Copyright (c) 2003-2005 Sam Leffler, Errno Consulting
+ Copyright (c) 2003, 2004 David Young
+ Copyright (c) 1996-2000 Whistle Communications, Inc.
+ Copyright (c) 1991, 1993 The Regents of the University of California
+License: BSD-3
+ On Debian systems the full text of the BSD license can be found in the
+ `/usr/share/common-licenses/BSD' file.
-Some files are distributed under a license permitting distribution without
-modification, and are provided in binary form only. As such, this software
-does not qualify for inclusion in Debian 'main', and is only available from
-the 'non-free' section of Debian.
+Files: *
+Copyright: Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
+License: BSD-3 | GPL-2
+ All other files contained in this distribution are covered by the following
+ dual GPL/BSD license:
+ Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
+ All rights reserved.
-Files licensed under either BSD or BSD / GPL:
-============================================
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer,
+ without modification.
+ 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
+ redistribution must be conditioned upon including a substantially
+ similar Disclaimer requirement for further binary redistribution.
+ 3. Neither the names of the above-listed copyright holders nor the names
+ of any contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
-net80211/ieee80211_linux.c, net80211/ieee80211_linux.h and
-net80211/if_media.c are under BSD-style license only (non-GPL).
+ Alternatively, this software may be distributed under the terms of the
+ GNU General Public License ("GPL") version 2 as published by the Free
+ Software Foundation.
-net80211/ieee80211_radiotap.h is Copyright (c) 2003, 2004 David Young and is
-licensed under BSD license.
+ NO WARRANTY
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGES.
-net80211/if_media.h is Copyright (c) 1997 Jonathan Stone and Jason R. Thorpe.
-and is licensed under BSD license.
+ On Debian systems the full text of the GNU General Public License version 2
+ can be found in the `/usr/share/common-licenses/GPL-2' file.
-net80211/rc4.c and net80211/rc4.h are Copyright (c) 1996-2000 Whistle
-Communications, Inc. and are licensed under a BSD-style license.
-
-include/sys/queue.h is Copyright (c) 1991, 1993 The Regents of the University
-of California and is licensed under BSD license.
-
-Problematic files:
-=================
-
-The following files constituing the "Hardware Abstraction Layer" are licensed
-under a license permitting distribution without modification, and are available
-in binary form only:
-
-hal/ah_desc.h
-hal/ah_devid.h
-hal/ah.h
-hal/ah_soc.h
-hal/version.h
-hal/public/ap51.hal.o.uu
-hal/public/mips1-le-elf.hal.o.uu
-hal/public/powerpc-le-eabi.hal.o.uu
-hal/public/powerpc-be-eabi.hal.o.uu
-hal/public/ap43.hal.o.uu
-hal/public/xscale-le-elf.hal.o.uu
-hal/public/mips-be-elf.hal.o.uu
-hal/public/ap61.hal.o.uu
-hal/public/mipsisa32-le-elf.hal.o.uu
-hal/public/armv4-be-elf.hal.o.uu
-hal/public/ap30.hal.o.uu
-hal/public/arm9-le-thumb-elf.hal.o.uu
-hal/public/mipsisa32-be-elf.hal.o.uu
-hal/public/powerpc-be-elf.hal.o.uu
-hal/public/mips1-be-elf.hal.o.uu
-hal/public/i386-elf.hal.o.uu
-hal/public/sh4-le-elf.hal.o.uu
-hal/public/x86_64-elf.hal.o.uu
-hal/public/xscale-be-elf.hal.o.uu
-hal/public/armv4-le-elf.hal.o.uu
-hal/public/alpha-elf.hal.o.uu
-hal/public/sparc64-be-elf.hal.o.uu
-hal/public/mips-le-elf.hal.o.uu
-hal/public/sparc-be-elf.hal.o.uu
-
-The following copyright governs the distribution of the binary HAL part
-of madwifi:
-
- Copyright (c) 2002-2005 Sam Leffler, Errno Consulting, Atheros
- Communications, Inc. All rights reserved.
-
- Redistribution and use in source and binary forms are permitted
- provided that the following conditions are met:
- 1. The materials contained herein are unmodified and are used
- unmodified.
- 2. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following NO
- ''WARRANTY'' disclaimer below (''Disclaimer''), without
- modification.
- 3. Redistributions in binary form must reproduce at minimum a
- disclaimer similar to the Disclaimer below and any redistribution
- must be conditioned upon including a substantially similar
- Disclaimer requirement for further binary redistribution.
- 4. Neither the names of the above-listed copyright holders nor the
- names of any contributors may be used to endorse or promote
- product derived from this software without specific prior written
- permission.
-
- NO WARRANTY
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT,
- MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE
- FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGES.
-
-
-Other files:
-===========
-
-All other files contained in this distribution are covered by the following
-dual GPL/BSD license:
-
- Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer,
- without modification.
- 2. Redistributions in binary form must reproduce at minimum a disclaimer
- similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
- redistribution must be conditioned upon including a substantially
- similar Disclaimer requirement for further binary redistribution.
- 3. Neither the names of the above-listed copyright holders nor the names
- of any contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- Alternatively, this software may be distributed under the terms of the
- GNU General Public License ("GPL") version 2 as published by the Free
- Software Foundation.
-
- NO WARRANTY
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
- IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- THE POSSIBILITY OF SUCH DAMAGES.
+Files: debian/*
+Copyright: Copyright (c) 2005 - 2008, Kel Modderman <kel at otaku42.de>
+License: GPL-2
+ On Debian systems the full text of the GNU General Public License version 2
+ can be found in the `/usr/share/common-licenses/GPL-2' file.
Modified: unstable/madwifi/debian/rules
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/rules?rev=359&op=diff
==============================================================================
--- unstable/madwifi/debian/rules (original)
+++ unstable/madwifi/debian/rules Fri Aug 29 16:05:15 2008
@@ -3,21 +3,15 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/quilt/quilt.make
+build:
+ dh $@ --before configure
+ dh $@ --after build
-build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
- dh_testdir
- touch $@
-
-clean: unpatch
- dh_testdir
- dh_clean build-stamp
+clean:
+ dh $@
install: build
- dh_testdir
- dh_testroot
- dh_clean -k
+ dh $@ --before dh_auto_install
install -D -m 0755 debian/rules.modules \
debian/tmp/modules/madwifi/debian/rules
@@ -35,22 +29,13 @@
tar jcf debian/madwifi-source/usr/src/madwifi.tar.bz2 \
-C debian/tmp modules
+ dh $@ --after dh_auto_install
+
binary-arch:
# We have nothing to do by default.
binary-indep: build install
- dh_testdir
- dh_testroot
- dh_install
- dh_installdocs
- dh_installchangelogs
- dh_link
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh $@
binary: binary-indep binary-arch
.PHONY: build build-stamp clean install binary-indep binary-arch binary
@@ -59,10 +44,10 @@
UPSVERS := $(shell echo $(DEBVERS) | cut -d'+' -f1 | tr '~' '-')
SVNVERS := $(shell echo $(DEBVERS) | sed -n 's/.*+\(.*\)/\1/p' | tr '.' '-')
ifneq "$(SVNVERS)" ""
-ORIGTAR := madwifi-trunk-$(SVNVERS).tar.gz
-#ORIGTAR := madwifi-hal-0.10.5.6-$(SVNVERS).tar.gz
-ORIGURL := http://snapshots.madwifi.org/madwifi-trunk/
-#ORIGURL := http://snapshots.madwifi.org/madwifi-hal-0.10.5.6/
+#ORIGTAR := madwifi-trunk-$(SVNVERS).tar.gz
+#ORIGURL := http://snapshots.madwifi.org/madwifi-trunk/
+ORIGTAR := madwifi-hal-2008-08-15-$(SVNVERS).tar.gz
+ORIGURL := http://snapshots.madwifi.org/madwifi-hal-2008-08-15/
else
ORIGTAR := madwifi-$(UPSVERS).tar.gz
ORIGURL := http://optusnet.dl.sourceforge.net/sourceforge/madwifi/
@@ -71,6 +56,5 @@
get-orig-source:
@dh_testdir
-
@test -d ../tarballs || mkdir -p ../tarballs
@wget -c -O ../tarballs/$(DEBTAR) $(ORIGURL)$(ORIGTAR)
More information about the Pkg-madwifi-maintainers
mailing list