[debian-release: This mail serves as both an NMU diff an an unblock request.
Please review and unblock.]

I have uploaded an NMU of zd1211-firmware to the 5 day delayed queue.
This upgrades it to a new upstream version, so providing a complete NMU
diff is tricky. I have attached a diff for the packaging changes. The
changes to the firmware blobs consist of renaming the existing ones, and
adding several new ones, as follows:

md5sum                                  old                     new
86c2d2fae72e8921b510d7bd13be4c24        zd1211-WS11Ub.fw        zd1211_ub
432ac12a108496ea074eac59ac36bbb3        zd1211-WS11UPh.fw       zd1211_uph
a3d88304fcf81bf6e6723929f3cf5118        zd1211-WS11UPhm.fw      zd1211_uphm
491aeb0e0d558c9461445979fe9ef074        zd1211-WS11UPhR.fw      zd1211_uphr
3721fe605336a2facf4c15                  zd1211-WS11Ur.fw        zd1211_ur
0a8573604fa5ce9761b717610765f335        N/A                     zd1211b_ub
432ac12a108496ea074eac59ac36bbb3        N/A                     zd1211b_uph
8e20edaee2720dfa1d708376477e7613        N/A                     zd1211b_uphm
78292aa7cc304f7e765c9c11308c480c        N/A                     zd1211b_uphr

As noted in the changelog, I have made sure that it provides the same
filenames (and md5sums) as the old version did, to avoid breaking
anything with the zd1211 driver, while also providing the new filenames
and new firmwares for the zd1211rw driver.

I've also confirmed that the current version of the zd1211-source driver
does not need or try to use any of the new firmware files. (FWIW, it
doesn't try to use zd1211-WS11UPh.fw at all either.) And I've checked
that zd1211 stull successfully loads the firmware files. Therefore I feel
that the possibility of breakage introduced by my changes is very low.

-- 
see shy jo
diff -Nru /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/README /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/README
--- /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/README	1969-12-31 19:00:00.000000000 -0500
+++ /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/README	2006-12-30 17:23:40.000000000 -0500
@@ -0,0 +1,31 @@
+README
+
+This distribution contains the firmware files for the
+ZD1211 chip, which is used in WLAN USB sticks. Copy these files to
+/lib/firmware/zd1211, where it can be loaded by the rewritten
+zd1211 driver.
+
+The files are generated from C header files distributed in the
+original ZyDAS ZD1211 driver under the GNU Public License.
+
+The full source of the original ZYDAS driver is available from
+http://www.deine-taler.de/zd1211/.
+
+HISTORY
+
+VERSION 1.3 (2006-12-30)
+Sync to vendor driver v2.16.0.0
+Large packet support is now disabled. The zd1211 firmware is now the same as
+v1.1 but the zd1211b firmware is new: It is the same which is shipped in the
+2.10.0.0 release which supposedly fixes a "reboot issue"
+
+VERSION 1.2 (2006-07-22)
+Sync to vendor driver v2.13.0.0
+Release notes mention that this firmware includes largepacket support
+
+VERSION 1.1 (2006-04-30)
+Added ZD1211B firmware files
+
+VERSION 1.0 (2006-04-16)
+This firmware has been generated from fersion 2_5_0_0 of the Zydas
+driver, 2006-04-16.
diff -Nru /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/debian/changelog /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/debian/changelog
--- /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/debian/changelog	2007-02-21 16:15:05.000000000 -0500
+++ /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/debian/changelog	2007-02-21 16:15:06.000000000 -0500
@@ -1,3 +1,25 @@
+zd1211-firmware (2.16.0.0-0.1) unstable; urgency=low
+
+  * NMU
+  * New upstream release. This is version 1.3 from
+    http://sourceforge.net/projects/zd1211/, which is in turn derived from
+    version 2.16.0.0 from Zydas. Keeping the Zydas version number to avoid
+    introducing an epoch in an NMU.
+  * Old firmware files are not changed by this release (md5sums
+    identical), but 5 new ones needed by other hardware are added.
+    Closes: #363271
+  * Use symlink farm to provide the firmware in the locations used by the
+    zd1211rw in-kernel driver, as well as the zd1211 extra-kernel driver.
+    Closes: #383604
+  * Should be suitable for etch release now. Closes: #411912
+  * Modify package description to note that it will work with both the
+    out of tree and in-tree kernel modules.
+  * Downgrade recommends of zd1211-module to a suggests, since the in-kernel
+    module will also work.
+  * Current standards-version (no changes).
+
+ -- Joey Hess <[EMAIL PROTECTED]>  Wed, 21 Feb 2007 15:09:09 -0500
+
 zd1211-firmware (2.4.0.0-1) unstable; urgency=low
 
   * new firmware from upstream. this dropps the -b version
diff -Nru /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/debian/control /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/debian/control
--- /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/debian/control	2007-02-21 16:15:05.000000000 -0500
+++ /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/debian/control	2007-02-21 16:15:06.000000000 -0500
@@ -3,13 +3,16 @@
 Priority: extra
 Maintainer: Robert Jordens <[EMAIL PROTECTED]>
 Build-Depends-Indep: debhelper (>= 4.1.67), cdbs
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 
 Package: zd1211-firmware
 Architecture: all
 Depends: udev (>= 0.070-3) | hotplug (>= 0.0.20040329-19)
-Recommends: zd1211-module
-Description: Firmware images for the zd1211 wireless driver
+Suggests: zd1211-module
+Description: Firmware images for the zd1211 and zd1211rw wireless drivers
  This package contains the firmware to be used with the Linux kernel 
  dirvers for the USB wireless dongles that are based on the 
  ZyDAS ZD1211 802.11b/g USB WLAN chipset.
+ .
+ It works with both the zd1211 driver provided by the zd1211-source
+ package, as well as the new zd1211rw included in recent 2.6 kernels.
diff -Nru /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/debian/zd1211-firmware.install /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/debian/zd1211-firmware.install
--- /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/debian/zd1211-firmware.install	2007-02-21 16:15:05.000000000 -0500
+++ /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/debian/zd1211-firmware.install	2007-02-21 16:15:06.000000000 -0500
@@ -1 +1 @@
-zd1211*.fw /usr/lib/hotplug/firmware
+zd1211* /lib/firmware/zd1211/
diff -Nru /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/debian/zd1211-firmware.links /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/debian/zd1211-firmware.links
--- /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/debian/zd1211-firmware.links	1969-12-31 19:00:00.000000000 -0500
+++ /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/debian/zd1211-firmware.links	2007-02-21 16:15:06.000000000 -0500
@@ -0,0 +1,5 @@
+/lib/firmware/zd1211/zd1211_ub		/usr/lib/hotplug/firmware/zd1211-WS11Ub.fw
+/lib/firmware/zd1211/zd1211_uph		/usr/lib/hotplug/firmware/zd1211-WS11UPh.fw
+/lib/firmware/zd1211/zd1211_uphm	/usr/lib/hotplug/firmware/zd1211-WS11UPhm.fw
+/lib/firmware/zd1211/zd1211_uphr	/usr/lib/hotplug/firmware/zd1211-WS11UPhR.fw
+/lib/firmware/zd1211/zd1211_ur		/usr/lib/hotplug/firmware/zd1211-WS11Ur.fw
Binary files /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/zd1211-WS11UPh.fw and /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/zd1211-WS11UPh.fw differ
Binary files /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/zd1211-WS11UPhR.fw and /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/zd1211-WS11UPhR.fw differ
Binary files /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/zd1211-WS11UPhm.fw and /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/zd1211-WS11UPhm.fw differ
Binary files /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/zd1211-WS11Ub.fw and /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/zd1211-WS11Ub.fw differ
Binary files /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/zd1211-WS11Ur.fw and /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/zd1211-WS11Ur.fw differ
Binary files /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/zd1211_ub and /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/zd1211_ub differ
Binary files /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/zd1211_uph and /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/zd1211_uph differ
Binary files /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/zd1211_uphm and /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/zd1211_uphm differ
Binary files /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/zd1211_uphr and /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/zd1211_uphr differ
Binary files /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/zd1211_ur and /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/zd1211_ur differ
Binary files /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/zd1211b_ub and /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/zd1211b_ub differ
Binary files /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/zd1211b_uph and /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/zd1211b_uph differ
Binary files /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/zd1211b_uphm and /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/zd1211b_uphm differ
Binary files /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/zd1211b_uphr and /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/zd1211b_uphr differ
Binary files /home/joey/tmp/LVqfDExHoz/zd1211-firmware-2.4.0.0/zd1211b_ur and /home/joey/tmp/YCkCJDEfEp/zd1211-firmware-2.16.0.0/zd1211b_ur differ

Attachment: signature.asc
Description: Digital signature

Reply via email to