I couldn't resist, and merged the new version anyway (thanks Dad):
* Merge from Debian unstable. Remaining Ubuntu changes: - Ubuntu maintainer fields in control.* - debian/control updates concerning modules in Ubuntu kernels. - etc/Makefile: no hotplug agent - enable CONF_etc_Makefile.dpatch for udev rules - enable CONF_etc_linux-wlan-ng_rules.dpatch - CONF_etc_Makefile.dpatch: move udev rules to before ifupdown - CONF_etc_linux-wlan-ng_rules.dpatch: use DRIVERS in udev rules - debian/patches/ubuntu-wlan-udev-sh.dpatch and udev rules for network-manager compatibility - debian/linux-wlan-ng-pre-up: p80211 module probing only if needed - etc/rc.wlan: say p80211.ko instead of p80211.o * debian/control.firmware: drop recommends on -modules package (LP: #115580) * debian/linux-wlan-ng.modprobe: enable writeable extensions for network-manager operation (LP: #115594) * debian/linux-wlan-ng.install: remove slash before etc/wlan
I couldn't resist, and merged the new version anyway (thanks Dad):
* Merge from Debian unstable. Remaining Ubuntu changes: Makefile. dpatch for udev rules linux-wlan- ng_rules. dpatch Makefile. dpatch: move udev rules to before ifupdown linux-wlan- ng_rules. dpatch: use DRIVERS in udev rules patches/ ubuntu- wlan-udev- sh.dpatch and udev rules for
network- manager compatibility linux-wlan- ng-pre- up: p80211 module probing only if needed control. firmware: drop recommends on -modules package linux-wlan- ng.modprobe: enable writeable extensions for manager operation (LP: #115594) linux-wlan- ng.install: remove slash before etc/wlan
- Ubuntu maintainer fields in control.*
- debian/control updates concerning modules in Ubuntu kernels.
- etc/Makefile: no hotplug agent
- enable CONF_etc_
- enable CONF_etc_
- CONF_etc_
- CONF_etc_
- debian/
- debian/
- etc/rc.wlan: say p80211.ko instead of p80211.o
* debian/
(LP: #115580)
* debian/
network-
* debian/