r356 - in /etchnhalf/madwifi/debian: changelog madwifi-source-etchnhalf.README.debian madwifi-source-etchnhalf.links madwifi-source-etchnhalf.modass rules

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Thu Jul 24 12:16:38 2008
New Revision: 356

URL: http://svn.debian.org/wsvn/?sc=1&rev=356
Log:
Install modass override file to avoid breakage caused by -etchnhalf
namespace, and provide location to custom tarball location, allowing
module-assistant to work out of box with new package.

Added:
    etchnhalf/madwifi/debian/madwifi-source-etchnhalf.modass
Removed:
    etchnhalf/madwifi/debian/madwifi-source-etchnhalf.links
Modified:
    etchnhalf/madwifi/debian/changelog
    etchnhalf/madwifi/debian/madwifi-source-etchnhalf.README.debian
    etchnhalf/madwifi/debian/rules

Modified: etchnhalf/madwifi/debian/changelog
URL: http://svn.debian.org/wsvn/etchnhalf/madwifi/debian/changelog?rev=356&op=diff
==============================================================================
--- etchnhalf/madwifi/debian/changelog (original)
+++ etchnhalf/madwifi/debian/changelog Thu Jul 24 12:16:38 2008
@@ -10,8 +10,11 @@
     to avoid conflict with ath5k.
   * Remove Vcs-Svn fields from debian/control, move Homepage field back into
     long description. Debian etch dpkg does not handle these fields.
-
- -- Kel Modderman <kel at otaku42.de>  Thu, 24 Jul 2008 18:46:09 +1000
+  * Install modass override file to avoid breakage caused by -etchnhalf
+    namespace, and provide location to custom tarball location, allowing
+    module-assistant to work out of box with new package.
+
+ -- Kel Modderman <kel at otaku42.de>  Thu, 24 Jul 2008 21:58:40 +1000
 
 madwifi (1:0.9.4~rc2-1) unstable; urgency=low
 

Modified: etchnhalf/madwifi/debian/madwifi-source-etchnhalf.README.debian
URL: http://svn.debian.org/wsvn/etchnhalf/madwifi/debian/madwifi-source-etchnhalf.README.debian?rev=356&op=diff
==============================================================================
--- etchnhalf/madwifi/debian/madwifi-source-etchnhalf.README.debian (original)
+++ etchnhalf/madwifi/debian/madwifi-source-etchnhalf.README.debian Thu Jul 24 12:16:38 2008
@@ -3,9 +3,7 @@
 
 This package provides the madwifi source code and binaries that can be used to
 build modules that work with your custom built linux kernel. The source files 
-are located in /usr/src/etchnhalf/madwifi.tar.bz2; unpacking that file in
-/usr/src/etchnhalf will produce a build tree in /usr/src/etchnhalf/modules/madwifi/
-(The tar file can also be unpacked elsewhere).
+are located in /usr/src/etchnhalf/madwifi.tar.bz2.
 
 For users of the madwifi debian packages from http://debian.marlow.dk/, there
 is no guarentee that the upgrade process will be smooth. Please purge all
@@ -19,7 +17,7 @@
 Please install the module-assistant package and issue the following commands:-
 
   $ m-a prepare
-  $ MOD_SRCDIR=/usr/src/etchnhalf m-a a-i madwifi-source-etchnhalf
+  $ m-a a-i madwifi-source-etchnhalf
 
 The above commands will prepare, compile, package and install a set of madwifi
 modules for your kernel.

Added: etchnhalf/madwifi/debian/madwifi-source-etchnhalf.modass
URL: http://svn.debian.org/wsvn/etchnhalf/madwifi/debian/madwifi-source-etchnhalf.modass?rev=356&op=file
==============================================================================
--- etchnhalf/madwifi/debian/madwifi-source-etchnhalf.modass (added)
+++ etchnhalf/madwifi/debian/madwifi-source-etchnhalf.modass Thu Jul 24 12:16:38 2008
@@ -1,0 +1,10 @@
+#!/bin/sh
+
+# Override source package name, to avoid namespace breakage
+# caused by extra 'nhalf suffix
+MA_SOURCE_PKG=madwifi-source
+
+# Location to 'nhalf tarball
+TARBALL=/usr/src/etchnhalf/madwifi.tar.bz2
+
+. /usr/share/modass/packages/default.sh

Modified: etchnhalf/madwifi/debian/rules
URL: http://svn.debian.org/wsvn/etchnhalf/madwifi/debian/rules?rev=356&op=diff
==============================================================================
--- etchnhalf/madwifi/debian/rules (original)
+++ etchnhalf/madwifi/debian/rules Thu Jul 24 12:16:38 2008
@@ -34,6 +34,9 @@
 	mkdir -p debian/madwifi-source-etchnhalf/usr/src/etchnhalf/
 	tar jcf debian/madwifi-source-etchnhalf/usr/src/etchnhalf/madwifi.tar.bz2 \
 		-C debian/tmp modules
+	
+	install -D -m 0755 debian/madwifi-source-etchnhalf.modass \
+		debian/madwifi-source-etchnhalf/usr/share/modass/overrides/madwifi-source-etchnhalf
 	
 	touch $@