diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-31 10:59:28 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-31 10:59:28 -0300 |
commit | 36f1b1bb12934e4fd9012c0ee5d4e3c885a2d433 (patch) | |
tree | 397141926cac78871a3e9d53cd8fb824bc1b9cd3 /extra/gnome-bluetooth | |
parent | 0858e3f6c7deaae69a94818c0d317a767aa3d481 (diff) | |
parent | 5827948456201df72a1bd73e87977c569129fb27 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/percona-server/PKGBUILD
community/xmlrpc-c/PKGBUILD
core/util-linux/PKGBUILD
extra/colord/PKGBUILD
extra/epiphany/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/evolution/PKGBUILD
extra/gcr/PKGBUILD
extra/gdm/PKGBUILD
extra/gnome-color-manager/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-dictionary/PKGBUILD
extra/gnome-font-viewer/PKGBUILD
extra/gnome-screenshot/PKGBUILD
extra/gnome-search-tool/PKGBUILD
extra/gnome-system-log/PKGBUILD
extra/gobject-introspection/PKGBUILD
extra/grilo/PKGBUILD
extra/gtkmm3/PKGBUILD
extra/gvfs/PKGBUILD
extra/json-glib/PKGBUILD
extra/libgnome-keyring/PKGBUILD
extra/nautilus-open-terminal/PKGBUILD
extra/pidgin/PKGBUILD
extra/pygobject/PKGBUILD
extra/rest/PKGBUILD
extra/rhythmbox/PKGBUILD
extra/seahorse/PKGBUILD
extra/totem/PKGBUILD
extra/xorg-xinit/PKGBUILD
extra/yelp/PKGBUILD
Diffstat (limited to 'extra/gnome-bluetooth')
-rw-r--r-- | extra/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules | 10 | ||||
-rw-r--r-- | extra/gnome-bluetooth/PKGBUILD | 12 |
2 files changed, 9 insertions, 13 deletions
diff --git a/extra/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules b/extra/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules index a76c1e73c..d7d9650dc 100644 --- a/extra/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules +++ b/extra/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules @@ -1,11 +1,7 @@ # Get access to /dev/rfkill for users # See https://bugzilla.redhat.com/show_bug.cgi?id=514798 # -# Updated for udev >= 154 -# http://bugs.debian.org/582188 -# https://bugzilla.redhat.com/show_bug.cgi?id=588660 +# Simplified by Kay Sievers +# https://bugzilla.redhat.com/show_bug.cgi?id=733326 -ENV{ACL_MANAGE}=="0", GOTO="gnome_bluetooth_end" -ACTION!="add|change", GOTO="gnome_bluetooth_end" -KERNEL=="rfkill", TAG+="udev-acl" -LABEL="gnome_bluetooth_end" +KERNEL=="rfkill", SUBSYSTEM=="misc", TAG+="uaccess" diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD index cad7fa98a..5b1fee7a1 100644 --- a/extra/gnome-bluetooth/PKGBUILD +++ b/extra/gnome-bluetooth/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 162989 2012-07-04 17:08:04Z ibiru $ +# $Id: PKGBUILD 169888 2012-10-30 22:33:39Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-bluetooth -pkgver=3.4.2 -pkgrel=1 +pkgver=3.6.0 +pkgrel=2 pkgdesc="The GNOME Bluetooth Subsystem" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/GnomeBluetooth" license=('GPL' 'LGPL') depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf' 'libnotify') -makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto' 'gobject-introspection') +makedepends=('intltool' 'nautilus-sendto' 'gobject-introspection' 'itstool' 'docbook-xsl') options=('!libtool' '!emptydirs') install=gnome-bluetooth.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz 61-gnome-bluetooth-rfkill.rules) -sha256sums=('c58480f1687aca048444d5e4dbd306594d0785c8e6e74f99fa0b13e57fdad4de' - 'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474') +sha256sums=('021d9711d76e6d195812b1804ff39b5936ce978c25f900bc92e4bffd7045d306' + '8dd2d3637f380a89e72f65e6c8021e994ccbdc645f1a1b1dbffe74ac9f061f53') build() { cd $pkgname-$pkgver |