Hello community, here is the log from the commit of package podsleuth checked in at Fri Jun 6 17:48:00 CEST 2008. -------- --- podsleuth/podsleuth.changes 2008-05-27 01:30:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/STABLE/podsleuth/podsleuth.changes 2008-06-05 22:59:59.054819000 +0200 @@ -1,0 +2,8 @@ +Thu Jun 5 23:05:34 CEST 2008 - abockover@suse.de + +- Backported patches from 0.6.2 release: + * Detect and cope when the iPod_Control directory is missing + * Updated to work with newer HAL when scanning for iPods (console client) + * Fix exec path inside wrapper scripts to use ${prefix}/lib, not ${libdir} + +------------------------------------------------------------------- New: ---- console-client-detection.patch ipod-control-missing.patch prefix-lib-exec.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ podsleuth.spec ++++++ --- /var/tmp/diff_new_pack.H13359/_old 2008-06-06 17:45:48.000000000 +0200 +++ /var/tmp/diff_new_pack.H13359/_new 2008-06-06 17:45:48.000000000 +0200 @@ -13,12 +13,15 @@ Name: podsleuth Version: 0.6.1 -Release: 53 +Release: 58 License: X11/MIT Group: Hardware/Other Summary: PodSleuth provides rich iPod metadata through HAL Url: http://banshee-project.org/PodSleuth Source: %{name}-%{version}.tar.bz2 +Patch0: console-client-detection.patch +Patch1: prefix-lib-exec.patch +Patch2: ipod-control-missing.patch AutoReqProv: on PreReq: filesystem BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -51,6 +54,9 @@ %prep %setup -q +%patch0 +%patch1 +%patch2 %build %{?env_options} @@ -75,6 +81,11 @@ %{_prefix}/lib/podsleuth/PodSleuth.dll* %changelog +* Fri Jun 06 2008 abockover@suse.de +- Backported patches from 0.6.2 release: + * Detect and cope when the iPod_Control directory is missing + * Updated to work with newer HAL when scanning for iPods (console client) + * Fix exec path inside wrapper scripts to use ${prefix}/lib, not ${libdir} * Tue May 27 2008 ro@suse.de - buildreq: use sg3_utils instead of scsi * Wed Jan 16 2008 coolo@suse.de ++++++ console-client-detection.patch ++++++ --- src/PodSleuth.Hal/PodSleuth.HalFrontend/HalClient.cs 2007/10/10 19:25:15 44 +++ src/PodSleuth.Hal/PodSleuth.HalFrontend/HalClient.cs 2008/06/05 00:15:58 56 @@ -82,8 +82,7 @@ Hal.Manager manager = new Hal.Manager(); int count = 0; - foreach(Hal.Device ipod in manager.FindDeviceByStringMatchAsDevice( - "portable_audio_player.type", "ipod")) { + foreach(Hal.Device ipod in manager.FindDeviceByStringMatchAsDevice("info.product", "iPod")) { foreach(Hal.Device volume in ipod.GetChildrenAsDevice(manager)) { if(!volume.IsVolume || !volume.PropertyExists("volume.is_mounted") || @@ -233,8 +232,13 @@ Console.WriteLine(" - Device Class: {0}", volume[HalNamespace + "ipod.model.device_class"]); if(!volume.GetPropertyBoolean(HalNamespace + "ipod.is_unknown")) { - Console.WriteLine(" - Generation: {0}", volume.GetPropertyDouble(HalNamespace + "ipod.model.generation")); - Console.WriteLine(" - Shell Color: {0}", volume[HalNamespace + "ipod.model.shell_color"]); + if(volume.PropertyExists(HalNamespace + "ipod.model.generation")) { + Console.WriteLine(" - Generation: {0}", volume.GetPropertyDouble(HalNamespace + "ipod.model.generation")); + } + + if(volume.PropertyExists("ipod.model.shell_color")) { + Console.WriteLine(" - Shell Color: {0}", volume[HalNamespace + "ipod.model.shell_color"]); + } } else { Console.WriteLine(" - Model information could not be determined"); Console.WriteLine(" Try a `podsleuth --update --rescan` or visit"); @@ -275,7 +279,7 @@ private static void ShowVersion() { - Console.WriteLine("PodSleuth {0}, Copyright (C) 2007 Novell, Inc.", Version); + Console.WriteLine("PodSleuth {0}, Copyright (C) 2007-2008 Novell, Inc.", Version); Console.WriteLine("http://banshee-project.org/PodSleuth"); } ++++++ ipod-control-missing.patch ++++++ --- src/PodSleuth.Hal/PodSleuth.HalFrontend/HalPopulator.cs 2007/10/10 19:25:15 44 +++ src/PodSleuth.Hal/PodSleuth.HalFrontend/HalPopulator.cs 2008/06/05 00:15:58 56 @@ -117,9 +117,11 @@ } } - hal_device.SetPropertyString(HalNamespace + "ipod.control_path", - pod_device.Paths.IpodControlDirectory); - + if(!String.IsNullOrEmpty(pod_device.Paths.IpodControlDirectory)) { + hal_device.SetPropertyString(HalNamespace + "ipod.control_path", + pod_device.Paths.IpodControlDirectory); + } + hal_device.SetPropertyString(HalNamespace + "ipod.firmware_version", pod_device.FirmwareVersion); ++++++ prefix-lib-exec.patch ++++++ --- src/PodSleuth.Hal/hal-podsleuth.in 2007/05/03 22:19:58 29 +++ src/PodSleuth.Hal/hal-podsleuth.in 2008/06/05 01:08:41 57 @@ -2,7 +2,7 @@ MONO=mono MONO_ARGS="--debug" -MONO_EXEC="@expanded_libdir@/@PACKAGE@/PodSleuth.Hal.exe" +MONO_EXEC="@prefix@/lib/@PACKAGE@/PodSleuth.Hal.exe" if [ "$1" = "--update" ]; then MONO_EXEC_ARGS="--update" --- src/PodSleuth.Hal/podsleuth.in 2007/05/01 16:53:09 14 +++ src/PodSleuth.Hal/podsleuth.in 2008/06/05 01:29:01 58 @@ -1,4 +1,4 @@ #!/bin/bash -mono @expanded_libdir@/@PACKAGE@/PodSleuth.Hal.exe $@ +mono @prefix@/lib/@PACKAGE@/PodSleuth.Hal.exe $@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org