← Back to branch summary

~ubuntu-branches/ubuntu/natty/hal/natty

« back to all changes in this revision

Viewing changes to hald/solaris/devinfo_misc.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2009-06-26 10:04:33 UTC
  • mfrom: (1.2.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20090626100433-nd42rcjbmg5261tx
Tags: 0.5.12+git20090626-0ubuntu1
https://launchpad.net/bugs/384890
* New upstream git snapshot:
  - Add input.keys capability to power/hibernate/etc. keys. (LP: #384890)
* Drop 01_tablet_evdev.patch, 50_no_crash_on_md_blockdev.patch: Applied
  upstream.
* 04_nvidia_brightness.patch: Update to new upstream version.
* debian/control: Change back Vcs-Bzr:, Ubuntu package are only for full
  source trees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hald/solaris/devinfo_misc.c
74
74
        hal_device_set_udi (d, "/org/freedesktop/Hal/devices/computer");
75
75
        hal_device_property_set_string (d, "solaris.devfs_path", devfs_path);
76
76
 
 
77
        if (PACKAGE_VERSION) {
 
78
                int major, minor, micro;
 
79
 
 
80
                hal_device_property_set_string (root, "org.freedesktop.Hal.version", PACKAGE_VERSION);
 
81
                if ( sscanf( PACKAGE_VERSION, "%d.%d.%d", &major, &minor, &micro ) == 3 ) {
 
82
                        hal_device_property_set_int (root, "org.freedesktop.Hal.version.major", major);
 
83
                        hal_device_property_set_int (root, "org.freedesktop.Hal.version.minor", minor);
 
84
                        hal_device_property_set_int (root, "org.freedesktop.Hal.version.micro", micro);
 
85
                }
 
86
        }
 
87
 
77
88
        if (uname (&un) >= 0) {
78
89
                hal_device_property_set_string (d, "system.kernel.name", un.sysname);
79
90
                hal_device_property_set_string (d, "system.kernel.version", un.release);