[Pkg-utopia-commits] r258 - in packages/unstable/hal/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2005-06-30 21:40:33 +0000 (Thu, 30 Jun 2005)
New Revision: 258

Added:
   packages/unstable/hal/debian/patches/dvd_plus_r_rw_typo.diff
Modified:
   packages/unstable/hal/debian/changelog
Log:
Fix dvd+r and dvd+rw typo's in libhal-storage

Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2005-06-22 15:34:24 UTC (rev 257)
+++ packages/unstable/hal/debian/changelog	2005-06-30 21:40:33 UTC (rev 258)
@@ -1,3 +1,11 @@
+hal (0.4.8-3) unstable; urgency=low
+
+  * debian/patches/dvd_plus_r_rw_typo.diff 
+    + Fix dvd+r and dvd+rw typo's in libhal-storage0 (Patch by Modestas
+    Vainius) (Closes: #315757)
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Thu, 30 Jun 2005 23:32:30 +0200
+
 hal (0.4.8-2) unstable; urgency=low
 
   * debian/ipod-music-player.fdi 

Added: packages/unstable/hal/debian/patches/dvd_plus_r_rw_typo.diff
===================================================================
--- packages/unstable/hal/debian/patches/dvd_plus_r_rw_typo.diff	2005-06-22 15:34:24 UTC (rev 257)
+++ packages/unstable/hal/debian/patches/dvd_plus_r_rw_typo.diff	2005-06-30 21:40:33 UTC (rev 258)
@@ -0,0 +1,15 @@
+diff -uNr hal-0.4.8.old/libhal-storage/libhal-storage.c hal-0.4.8/libhal-storage/libhal-storage.c
+--- hal-0.4.8.old/libhal-storage/libhal-storage.c	2005-06-25 18:26:30.000000000 +0300
++++ hal-0.4.8/libhal-storage/libhal-storage.c	2005-06-25 18:27:41.000000000 +0300
+@@ -1028,9 +1028,9 @@
+ 			vol->disc_type = HAL_VOLUME_DISC_TYPE_DVDR;
+ 		} else if (strcmp (disc_type_textual, "dvd_rw") == 0) {
+ 			vol->disc_type = HAL_VOLUME_DISC_TYPE_DVDRW;
+-		} else if (strcmp (disc_type_textual, "dvd_plusr") == 0) {
++		} else if (strcmp (disc_type_textual, "dvd_plus_r") == 0) {
+ 			vol->disc_type = HAL_VOLUME_DISC_TYPE_DVDPLUSR;
+-		} else if (strcmp (disc_type_textual, "dvd_plusrw") == 0) {
++		} else if (strcmp (disc_type_textual, "dvd_plus_rw") == 0) {
+ 			vol->disc_type = HAL_VOLUME_DISC_TYPE_DVDPLUSRW;
+ 		}
+ 	}