[Pkg-utopia-commits] r163 - in packages/hal/trunk/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2005-01-10 09:59:53 +0100 (Mon, 10 Jan 2005)
New Revision: 163

Added:
   packages/hal/trunk/debian/patches/check-ide-floppy-for-zip.patch
   packages/hal/trunk/debian/patches/volume_id-fat.patch
Modified:
   packages/hal/trunk/debian/changelog
Log:
Added some nice patches for hal that were on the hal mailing list..



Modified: packages/hal/trunk/debian/changelog
===================================================================
--- packages/hal/trunk/debian/changelog	2005-01-07 10:32:55 UTC (rev 162)
+++ packages/hal/trunk/debian/changelog	2005-01-10 08:59:53 UTC (rev 163)
@@ -1,3 +1,14 @@
+hal (0.4.4-2) unstable; urgency=low
+
+  * debian/patches/volume_id-fat.patch
+    + Added. Fixes label reading on large FAT volumes. Patch from Kay Sievers.
+      (Closes: #271997)
+  * debian/patches/check-ide-floppy-for-zip.patch
+    + Added. Support IDE Zip drives that appear as IDE floppies. Patch from
+      David Zeuthen.
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Mon, 10 Jan 2005 09:28:55 +0100
+
 hal (0.4.4-1) unstable; urgency=low
 
   * New upstream release

Added: packages/hal/trunk/debian/patches/check-ide-floppy-for-zip.patch
===================================================================
--- packages/hal/trunk/debian/patches/check-ide-floppy-for-zip.patch	2005-01-07 10:32:55 UTC (rev 162)
+++ packages/hal/trunk/debian/patches/check-ide-floppy-for-zip.patch	2005-01-10 08:59:53 UTC (rev 163)
@@ -0,0 +1,41 @@
+diff -ruN hal-0.4.4-old/fdi/20freedesktop/ide-drives.fdi hal-0.4.4/fdi/20freedesktop/ide-drives.fdi
+--- hal-0.4.4-old/fdi/20freedesktop/ide-drives.fdi	2004-12-16 00:07:14.000000000 +0100
++++ hal-0.4.4/fdi/20freedesktop/ide-drives.fdi	2005-01-10 09:31:26.000000000 +0100
+@@ -48,6 +48,37 @@
+ 	</match>
+       </match>
+     </match>
++
++    <match key="storage.bus" string="ide">
++      <match key="storage.drive_type" string="floppy">
++	<!-- IOMEGA Zip Drive -->
++	<match key="storage.model" contains_ncase="ZIP">
++          <merge key="storage.drive_type" type="string">zip</merge>
++          <merge key="storage.no_partitions_hint" type="bool">true</merge>
++          <merge key="storage.requires_eject" type="bool">true</merge>
++          <!-- treat as floppy and data at partition 4; adjust device file -->
++	  <append key="block.device" type="string">4</append>
++	</match>
++	
++	<!-- IOMEGA CLIK! Drive -->
++	<match key="storage.model" contains_ncase="CLIK">
++          <merge key="storage.drive_type" type="string">zip</merge>
++          <merge key="storage.no_partitions_hint" type="bool">true</merge>
++          <merge key="storage.requires_eject" type="bool">true</merge>
++          <!-- treat as floppy and data at partition 4; adjust device file -->
++	  <append key="block.device" type="string">4</append>
++	</match>
++	
++	<!-- Jaz -->
++	<match key="storage.model" contains_ncase="JAZ">
++          <merge key="storage.drive_type" type="string">jaz</merge>
++          <merge key="storage.no_partitions_hint" type="bool">true</merge>
++          <merge key="storage.requires_eject" type="bool">true</merge>
++          <!-- treat as floppy and data at partition 4; adjust device file -->
++	  <append key="block.device" type="string">4</append>
++	</match>
++      </match>
++    </match>
+       
+     </device>
+ </deviceinfo>

Added: packages/hal/trunk/debian/patches/volume_id-fat.patch
===================================================================
--- packages/hal/trunk/debian/patches/volume_id-fat.patch	2005-01-07 10:32:55 UTC (rev 162)
+++ packages/hal/trunk/debian/patches/volume_id-fat.patch	2005-01-10 08:59:53 UTC (rev 163)
@@ -0,0 +1,21 @@
+diff -ruN hal-0.4.4-old/hald/linux/volume_id/volume_id.c hal-0.4.4/hald/linux/volume_id/volume_id.c
+--- hal-0.4.4-old/hald/linux/volume_id/volume_id.c	2005-01-07 04:25:58.000000000 +0100
++++ hal-0.4.4/hald/linux/volume_id/volume_id.c	2005-01-10 09:12:00.000000000 +0100
+@@ -78,7 +78,7 @@
+ /* size of superblock buffer, reiserfs block is at 64k */
+ #define SB_BUFFER_SIZE				0x11000
+ /* size of seek buffer 4k */
+-#define SEEK_BUFFER_SIZE			0x1000
++#define SEEK_BUFFER_SIZE			0x10000
+ 
+ 
+ static void set_label_raw(struct volume_id *id,
+@@ -832,7 +832,7 @@
+ 	__u16 dir_entries;
+ 	__u32 sect_count;
+ 	__u16 reserved;
+-	__u16 fat_size;
++	__u32 fat_size;
+ 	__u32 root_cluster;
+ 	__u32 dir_size;
+ 	__u32 cluster_count;