Merge branch 'openelec-next' of github.com:OpenELEC/OpenELEC.tv into openelec-pvr

packages/network/bluez/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bluez"
-PKG_VERSION="4.91"
+PKG_VERSION="4.92"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/sysutils/udev/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="udev"
-PKG_VERSION="167"
+PKG_VERSION="168"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/sysutils/udev/patches/udev-168-remove_keymap_and_acl-0.1.patch

@@ -1,6 +1,6 @@
-diff -Naur udev-166/configure.ac udev-166.patch/configure.ac
---- udev-166/configure.ac	2010-12-16 13:37:25.000000000 +0100
-+++ udev-166.patch/configure.ac	2011-02-12 15:33:22.359406798 +0100
+diff -Naur udev-168/configure.ac udev-168.patch/configure.ac
+--- udev-168/configure.ac	2011-03-30 16:03:44.000000000 +0200
++++ udev-168.patch/configure.ac	2011-04-27 13:24:35.164449392 +0200
 @@ -86,9 +86,6 @@
  	AC_SUBST([GLIB_CFLAGS])
  	AC_SUBST([GLIB_LIBS])
@@ -11,10 +11,10 @@ diff -Naur udev-166/configure.ac udev-166.patch/configure.ac
  	PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12)
  	AC_SUBST(LIBUSB_CFLAGS)
  	AC_SUBST(LIBUSB_LIBS)
-diff -Naur udev-166/Makefile.am udev-166.patch/Makefile.am
---- udev-166/Makefile.am	2011-02-09 22:12:14.000000000 +0100
-+++ udev-166.patch/Makefile.am	2011-02-12 15:34:06.794544227 +0100
-@@ -477,21 +477,6 @@
+diff -Naur udev-168/Makefile.am udev-168.patch/Makefile.am
+--- udev-168/Makefile.am	2011-04-13 18:21:34.000000000 +0200
++++ udev-168.patch/Makefile.am	2011-04-27 13:25:23.987426115 +0200
+@@ -473,21 +473,6 @@
  libexec_PROGRAMS += extras/hid2hci/hid2hci
  
  # ------------------------------------------------------------------------------
@@ -36,11 +36,10 @@ diff -Naur udev-166/Makefile.am udev-166.patch/Makefile.am
  # usb-db - read USB vendor/device string database
  # ------------------------------------------------------------------------------
  extras_usb_db_usb_db_SOURCES = extras/usb-db/usb-db.c
-@@ -537,110 +522,6 @@
- dist_udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules
+@@ -534,111 +519,6 @@
  
  libexec_PROGRAMS += extras/mtd_probe/mtd_probe
-- 
+  
 -
 -# ------------------------------------------------------------------------------
 -# keymap - map custom hardware's multimedia keys
@@ -75,6 +74,7 @@ diff -Naur udev-166/Makefile.am udev-166.patch/Makefile.am
 -	extras/keymap/keymaps/asus \
 -	extras/keymap/keymaps/compaq-e_evo \
 -	extras/keymap/keymaps/dell \
+-	extras/keymap/keymaps/dell-latitude-xt2 \
 -	extras/keymap/keymaps/everex-xt5000 \
 -	extras/keymap/keymaps/fujitsu-amilo_pa_2548 \
 -	extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \
@@ -144,6 +144,7 @@ diff -Naur udev-166/Makefile.am udev-166.patch/Makefile.am
 -keymaps-distcheck-hook: extras/keymap/keys.txt
 -	$(top_srcdir)/extras/keymap/check-keymaps.sh $(top_srcdir) $^
 -DISTCHECK_HOOKS += keymaps-distcheck-hook
- 
+-
  endif # ENABLE_EXTRAS
  
+ # ------------------------------------------------------------------------------

packages/web/curl/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="curl"
-PKG_VERSION="7.21.4"
+PKG_VERSION="7.21.6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"