Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2011-11-07 14:23:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nut", Maintainer is "sbrabec@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/nut/nut.changes 2011-11-02 12:09:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2011-11-07 14:23:22.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 2 18:45:31 CET 2011 - sbrabec@suse.cz + +- Patch real source files to get missing devices (bnc#719292#c7). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nut-usb-ups-ids.patch ++++++ --- /var/tmp/diff_new_pack.P75dPq/_old 2011-11-07 14:23:23.000000000 +0100 +++ /var/tmp/diff_new_pack.P75dPq/_new 2011-11-07 14:23:23.000000000 +0100 @@ -1,36 +1,31 @@ -Index: nut-2.6.2/scripts/udev/nut-usbups.rules.in +Index: nut-2.6.2/drivers/blazer_usb.c =================================================================== ---- nut-2.6.2.orig/scripts/udev/nut-usbups.rules.in -+++ nut-2.6.2/scripts/udev/nut-usbups.rules.in -@@ -54,6 +54,8 @@ ATTR{idVendor}=="050d", ATTR{idProduct}= - ATTR{idVendor}=="050d", ATTR{idProduct}=="0980", MODE="664", GROUP="@RUN_AS_GROUP@" - # F6C1100-UNV, F6C1200-UNV - usbhid-ups - ATTR{idVendor}=="050d", ATTR{idProduct}=="1100", MODE="664", GROUP="@RUN_AS_GROUP@" -+# Belkin F6C1200-UNV -+ATTR{idVendor}=="0665", ATTR{idProduct}=="5161", MODE="664", GROUP="@RUN_AS_GROUP@" +--- nut-2.6.2.orig/drivers/blazer_usb.c ++++ nut-2.6.2/drivers/blazer_usb.c +@@ -305,8 +305,8 @@ static void *phoenix_subdriver(void) - # APC - # various models - usbhid-ups -@@ -84,9 +86,9 @@ ATTR{idVendor}=="06da", ATTR{idProduct}= - ATTR{idVendor}=="075d", ATTR{idProduct}=="0300", MODE="664", GROUP="@RUN_AS_GROUP@" - - # Cyber Power Systems --# 900AVR/BC900D, CP1200AVR/BC1200D - usbhid-ups -+# 900AVR/BC900D - usbhid-ups - ATTR{idVendor}=="0764", ATTR{idProduct}=="0005", MODE="664", GROUP="@RUN_AS_GROUP@" --# Dynex DX-800U? - usbhid-ups -+# CP1200AVR/BC1200D, Dynex DX-800U? - usbhid-ups - ATTR{idVendor}=="0764", ATTR{idProduct}=="0501", MODE="664", GROUP="@RUN_AS_GROUP@" - # OR2200LCDRM2U - usbhid-ups - ATTR{idVendor}=="0764", ATTR{idProduct}=="0601", MODE="664", GROUP="@RUN_AS_GROUP@" -@@ -177,4 +179,10 @@ ATTR{idVendor}=="10af", ATTR{idProduct}= - # GE EP series - blazer_usb - ATTR{idVendor}=="14f0", ATTR{idProduct}=="00c9", MODE="664", GROUP="@RUN_AS_GROUP@" + static usb_device_id_t blazer_usb_id[] = { + { USB_DEVICE(0x05b8, 0x0000), &cypress_subdriver }, /* Agiler UPS */ +- { 0x0001, 0x0000, &krauler_subdriver }, /* Krauler UP-M500VA */ +- { 0xffff, 0x0000, &krauler_subdriver }, /* Ablerex 625L USB */ ++ { USB_DEVICE(0x0001, 0x0000), &krauler_subdriver }, /* Krauler UP-M500VA */ ++ { USB_DEVICE(0xffff, 0x0000), &krauler_subdriver }, /* Ablerex 625L USB */ + { USB_DEVICE(0x0665, 0x5161), &cypress_subdriver }, /* Belkin F6C1200-UNV */ + { USB_DEVICE(0x06da, 0x0003), &ippon_subdriver }, /* Mustek Powermust */ + { USB_DEVICE(0x0f03, 0x0001), &cypress_subdriver }, /* Unitek Alpha 1200Sx */ +Index: nut-2.6.2/drivers/cps-hid.c +=================================================================== +--- nut-2.6.2.orig/drivers/cps-hid.c ++++ nut-2.6.2/drivers/cps-hid.c +@@ -48,9 +48,9 @@ static void *cps_battery_scale(void) -+# Krauler UP-M500VA - blazer_usb -+ATTR{idVendor}=="0001", ATTR{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@" -+ -+# Ablerex 625L USB -+ATTR{idVendor}=="ffff", ATTR{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@" -+ - LABEL="nut-usbups_rules_end" + /* USB IDs device table */ + static usb_device_id_t cps_usb_device_table[] = { +- /* 900AVR/BC900D, CP1200AVR/BC1200D */ ++ /* 900AVR/BC900D */ + { USB_DEVICE(CPS_VENDORID, 0x0005), NULL }, +- /* Dynex DX-800U? */ ++ /* CP1200AVR/BC1200D, Dynex DX-800U? */ + { USB_DEVICE(CPS_VENDORID, 0x0501), &cps_battery_scale }, + /* OR2200LCDRM2U */ + { USB_DEVICE(CPS_VENDORID, 0x0601), NULL }, -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org