diff -u linux-wlan-ng-0.2.8+svn1832+dfsg/debian/control.firmware linux-wlan-ng-0.2.8+svn1832+dfsg/debian/control.firmware --- linux-wlan-ng-0.2.8+svn1832+dfsg/debian/control.firmware +++ linux-wlan-ng-0.2.8+svn1832+dfsg/debian/control.firmware @@ -1,7 +1,8 @@ Source: linux-wlan-ng Section: non-free/admin Priority: extra -Maintainer: Victor Seva +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Victor Seva Uploaders: Enrico Tassi Build-Depends: debhelper (>= 4.1.10), dpkg-dev (>= 1.9.0) Standards-Version: 3.7.2 @@ -9,7 +10,7 @@ Package: linux-wlan-ng-firmware-files Architecture: any Depends: linux-wlan-ng (>= ${Source-Version}) -Recommends: linux-wlan-ng-doc, linux-wlan-ng-${Source-Version}-modules +Recommends: linux-wlan-ng-doc Description: firmware files used by the linux-wlan-ng driver linux-wlan-ng is a set of drivers and utilities that is intended to provide the full range of IEEE 802.11 MAC management capabilities for use in diff -u linux-wlan-ng-0.2.8+svn1832+dfsg/debian/changelog linux-wlan-ng-0.2.8+svn1832+dfsg/debian/changelog --- linux-wlan-ng-0.2.8+svn1832+dfsg/debian/changelog +++ linux-wlan-ng-0.2.8+svn1832+dfsg/debian/changelog @@ -1,3 +1,20 @@ +linux-wlan-ng (0.2.8+svn1832+dfsg-2ubuntu1) gutsy; urgency=low + + [ Tormod Volden ] + * Merge from Debian unstable, remaining changes: + - Ubuntu maintainer fields in control.* + - debian/control updates concerning modules in Ubuntu kernels + - etc/Makefile: no hotplug agent in Ubuntu + - etc/rc.wlan: say p80211.ko instead of p80211.o + * debian/control.firmware: drop recommends on -modules package + in Ubuntu (LP: #115580) + * wlan-udev.sh: remove dbus-send call + * Ubuntu bugs resolved in new Debian version: + - debian/linux-wlan-ng.modprobe: enable writeable extensions for + network-manager operation (LP: #115594) + + -- Tormod Volden Wed, 15 Aug 2007 20:51:11 +0200 + linux-wlan-ng (0.2.8+svn1832+dfsg-2) unstable; urgency=low * Removed spurious slash in .install file (Closes: #435008) @@ -23,6 +40,30 @@ -- Enrico Tassi Thu, 26 Jul 2007 10:57:15 +0100 +linux-wlan-ng (0.2.8+dfsg-1ubuntu2) gutsy; urgency=low + + * Set maintainer fields in in debian/control.firmware and + debian/control.modules.in (LP: #115585). + + -- Nathan Handler Tue, 29 May 2007 21:22:54 -0500 + +linux-wlan-ng (0.2.8+dfsg-1ubuntu1) gutsy; urgency=low + + [ Tormod Volden ] + * Merge from debian unstable, remaining changes: + - debian/control updates concerning modules in Ubuntu kernels. + - no hotplug agent + - enable CONF_etc_Makefile.dpatch for udev rules + - enable CONF_etc_linux-wlan-ng_rules.dpatch + * better p80211 module probing (closes ubuntu #65195) + * use DRIVERS in udev rules (closes ubuntu #78021) + * move udev rules to before ifupdown (ubuntu #29706) + * new udev rules and ubuntu-wlan-udev-sh.dpatch for + network-manager compatibility (ubuntu #104037) + * changed maintainer fields + + -- Tormod Volden Mon, 16 May 2007 20:58:41 +0200 + linux-wlan-ng (0.2.8+dfsg-1) unstable; urgency=low [ Victor Seva ] @@ -72,6 +113,18 @@ -- Victor Seva Sun, 7 Jan 2007 16:03:49 +0100 +linux-wlan-ng (0.2.6+svn20061108-2ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control updates concerning modules in Ubuntu kernels. + - modprobe of ieee80211 aswell as p80211. + - No-hotplug changes. + - Enable patches: + CONF_etc_Makefile.dpatch + CONF_etc_linux-wlan-ng_rules.dpatch + + -- Ben Collins Thu, 14 Dec 2006 09:13:51 +0000 + linux-wlan-ng (0.2.6+svn20061108-2) unstable; urgency=low * removed udev rules by ubuntu, they make firmware loading fail putting the @@ -713,0 +767 @@ + diff -u linux-wlan-ng-0.2.8+svn1832+dfsg/debian/patches/CONF_etc_wlan_wlan-udev_sh.dpatch linux-wlan-ng-0.2.8+svn1832+dfsg/debian/patches/CONF_etc_wlan_wlan-udev_sh.dpatch --- linux-wlan-ng-0.2.8+svn1832+dfsg/debian/patches/CONF_etc_wlan_wlan-udev_sh.dpatch +++ linux-wlan-ng-0.2.8+svn1832+dfsg/debian/patches/CONF_etc_wlan_wlan-udev_sh.dpatch @@ -5,9 +5,9 @@ ## DP: No description. @DPATCH@ -diff -urNad linux-wlan-ng-0.2.8+dfsg~/etc/wlan/wlan-udev.sh linux-wlan-ng-0.2.8+dfsg/etc/wlan/wlan-udev.sh ---- linux-wlan-ng-0.2.8+dfsg~/etc/wlan/wlan-udev.sh 2007-02-27 17:43:02.000000000 +0100 -+++ linux-wlan-ng-0.2.8+dfsg/etc/wlan/wlan-udev.sh 2007-05-14 23:42:17.000000000 +0200 +diff -urNad linux-wlan-ng-0.2.8+svn1832+dfsg-2ubuntu1~/etc/wlan/wlan-udev.sh linux-wlan-ng-0.2.8+svn1832+dfsg-2ubuntu1/etc/wlan/wlan-udev.sh +--- linux-wlan-ng-0.2.8+svn1832+dfsg-2ubuntu1~/etc/wlan/wlan-udev.sh 2007-08-15 20:46:45.000000000 +0200 ++++ linux-wlan-ng-0.2.8+svn1832+dfsg-2ubuntu1/etc/wlan/wlan-udev.sh 2007-08-15 20:47:37.000000000 +0200 @@ -8,6 +8,9 @@ # 01-01-2007 (rsk) add check for wlan_wext_write # 31-01-2007 (rsk) get the check right this time :) @@ -18,7 +18,7 @@ WEXT_PARAM=/sys/module/p80211/parameters/wlan_wext_write DEVICE=$1 -@@ -19,27 +22,17 @@ +@@ -19,27 +22,16 @@ WLAN_WEXT=`cat $WEXT_PARAM` fi @@ -46,7 +46,6 @@ - echo $DEVICE failed to come up! >&2 - exit 1 - fi -+ dbus-send --system /org/freedesktop/NetworkManager org.freedesktop.NetworkManager.RefreshDevice string:$DEVICE fi exit 0 diff -u linux-wlan-ng-0.2.8+svn1832+dfsg/debian/control.modules.in linux-wlan-ng-0.2.8+svn1832+dfsg/debian/control.modules.in --- linux-wlan-ng-0.2.8+svn1832+dfsg/debian/control.modules.in +++ linux-wlan-ng-0.2.8+svn1832+dfsg/debian/control.modules.in @@ -1,7 +1,8 @@ Source: linux-wlan-ng Section: admin Priority: extra -Maintainer: Victor Seva +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Victor Seva Uploaders: Enrico Tassi Build-Depends: debhelper (>= 5.0.37), dpkg-dev (>= 1.9.0) Standards-Version: 3.7.2 diff -u linux-wlan-ng-0.2.8+svn1832+dfsg/debian/control linux-wlan-ng-0.2.8+svn1832+dfsg/debian/control --- linux-wlan-ng-0.2.8+svn1832+dfsg/debian/control +++ linux-wlan-ng-0.2.8+svn1832+dfsg/debian/control @@ -1,7 +1,8 @@ Source: linux-wlan-ng Section: admin Priority: extra -Maintainer: Victor Seva +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Victor Seva Uploaders: Enrico Tassi Build-Depends: debhelper (>= 4.1.0), bzip2, dpatch Standards-Version: 3.7.2 @@ -21,6 +22,9 @@ This package provides the source code for the linux-wlan-ng kernel modules. After installing this you must use module-assistant to compile and install the modules. + . + Please note that you probably do not need this package on Ubuntu: the default + kernel already ships all necessary drivers. Package: linux-wlan-ng Architecture: any @@ -35,10 +39,9 @@ PCMCIA, PCI, and USB. Additionally, the package includes support for the PLX9052 based PCI to PCMCIA adapter with a few different PCMCIA cards. . - This package is useless without the appropriate - linux-wlan-ng-modules-x.yy.zz package for the kernel you are running. - You may have to build that by hand; see the README.Debian for - instructions. + The standard Ubuntu kernel already contains all necessary drivers. This + package ships utilities and integration scripts to make above cards work + seamlessly with the Ubuntu network infrastructure. Package: linux-wlan-ng-doc Architecture: all only in patch2: unchanged: --- linux-wlan-ng-0.2.8+svn1832+dfsg.orig/etc/rc.wlan +++ linux-wlan-ng-0.2.8+svn1832+dfsg/etc/rc.wlan @@ -31,7 +31,7 @@ # This will implicitly fire off wland via hotplug. echo -n "Starting WLAN Devices: " if ! $MODPROBE p80211; then - echo "Failed to load p80211.o." + echo "Failed to load p80211.ko." exit 1 fi only in patch2: unchanged: --- linux-wlan-ng-0.2.8+svn1832+dfsg.orig/etc/Makefile +++ linux-wlan-ng-0.2.8+svn1832+dfsg/etc/Makefile @@ -60,7 +60,6 @@ cp rc.wlan $(TARGET_ROOT_ON_HOST)$(RC_DIR)/init.d/wlan; \ chmod 755 $(TARGET_ROOT_ON_HOST)$(RC_DIR)/init.d/wlan ;\ if [ -d $(TARGET_ROOT_ON_HOST)/etc/hotplug ]; then \ - cp wlan.agent $(TARGET_ROOT_ON_HOST)/etc/hotplug; \ rm -f $(TARGET_ROOT_ON_HOST)/etc/hotplug/usb/prism2_usb; \ rm -f $(TARGET_ROOT_ON_HOST)/etc/hotplug/pci/prism2_pci; \ rm -f $(TARGET_ROOT_ON_HOST)/etc/hotplug/pci/prism2_plx; \