Date: Thursday, August 4, 2016 @ 11:13:19 Author: jgc Revision: 273019
archrelease: copy trunk to extra-i686, extra-x86_64 Added: upower/repos/extra-i686/PKGBUILD (from rev 273018, upower/trunk/PKGBUILD) upower/repos/extra-i686/fix-critical-action.patch (from rev 273018, upower/trunk/fix-critical-action.patch) upower/repos/extra-x86_64/PKGBUILD (from rev 273018, upower/trunk/PKGBUILD) upower/repos/extra-x86_64/fix-critical-action.patch (from rev 273018, upower/trunk/fix-critical-action.patch) Deleted: upower/repos/extra-i686/PKGBUILD upower/repos/extra-i686/fix-critical-action.patch upower/repos/extra-x86_64/PKGBUILD upower/repos/extra-x86_64/fix-critical-action.patch ----------------------------------------+ /PKGBUILD | 80 +++++++++++++++++++++++++++++++ /fix-critical-action.patch | 56 +++++++++++++++++++++ extra-i686/PKGBUILD | 39 --------------- extra-i686/fix-critical-action.patch | 28 ---------- extra-x86_64/PKGBUILD | 39 --------------- extra-x86_64/fix-critical-action.patch | 28 ---------- 6 files changed, 136 insertions(+), 134 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2016-08-04 11:13:15 UTC (rev 273018) +++ extra-i686/PKGBUILD 2016-08-04 11:13:19 UTC (rev 273019) @@ -1,39 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=upower -pkgver=0.99.4 -pkgrel=2 -pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" -arch=('i686' 'x86_64') -url="http://upower.freedesktop.org" -license=('GPL') -depends=('systemd' 'libusb' 'libimobiledevice' 'libgudev') -makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'python2') -backup=('etc/UPower/UPower.conf') -source=(http://upower.freedesktop.org/releases/$pkgname-$pkgver.tar.xz - fix-critical-action.patch) -sha256sums=('9ca325a6ccef505529b268ebbbd9becd0ce65a65f6ac7ee31e2e5b17648037b0' - '30c9e7587bd63f75d50f50f93bf97d9a80fc76f5ce875080487de04b2538beb4') - -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../fix-critical-action.patch -} - -build() { - cd $pkgname-$pkgver - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/$pkgname \ - --disable-static - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} Copied: upower/repos/extra-i686/PKGBUILD (from rev 273018, upower/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2016-08-04 11:13:19 UTC (rev 273019) @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=upower +pkgver=0.99.4+12+g402640b +pkgrel=1 +pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" +arch=('i686' 'x86_64') +url="http://upower.freedesktop.org" +license=('GPL') +depends=('systemd' 'libusb' 'libimobiledevice' 'libgudev') +makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'python2' 'git' 'gtk-doc') +backup=('etc/UPower/UPower.conf') +_commit=402640bee016472bf61c7a4ad9e5fac9790ea1bf +source=(git://anongit.freedesktop.org/upower#commit=$_commit) +md5sums=('SKIP') + +pkgver() { + cd $pkgname + git describe --tags | sed -e 's/UPOWER_//' -e 's/_/\./g' -e 's/-/+/g' +} + +build() { + cd $pkgname + + NOCONFIGURE=1 ./autogen.sh + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname \ + --disable-static + make +} + +package() { + cd $pkgname + make DESTDIR="$pkgdir" install +} Deleted: extra-i686/fix-critical-action.patch =================================================================== --- extra-i686/fix-critical-action.patch 2016-08-04 11:13:15 UTC (rev 273018) +++ extra-i686/fix-critical-action.patch 2016-08-04 11:13:19 UTC (rev 273019) @@ -1,28 +0,0 @@ -From 28cee8e2845b094488c337c4ecfa84ada0b6be60 Mon Sep 17 00:00:00 2001 -From: Martin Pitt <martin.p...@ubuntu.com> -Date: Tue, 23 Feb 2016 09:51:07 +0100 -Subject: daemon: fix get_critical_action() - -Fix copy&paste error from e7e9156f that called the wrong _complete_ function -for up_daemon_get_critical_action(). - -https://bugs.freedesktop.org/show_bug.cgi?id=94262 - -diff --git a/src/up-daemon.c b/src/up-daemon.c -index be14cbe..e95f904 100644 ---- a/src/up-daemon.c -+++ b/src/up-daemon.c -@@ -435,8 +435,8 @@ up_daemon_get_critical_action (UpExportedDaemon *skeleton, - GDBusMethodInvocation *invocation, - UpDaemon *daemon) - { -- up_exported_daemon_complete_get_display_device (skeleton, invocation, -- up_backend_get_critical_action (daemon->priv->backend)); -+ up_exported_daemon_complete_get_critical_action (skeleton, invocation, -+ up_backend_get_critical_action (daemon->priv->backend)); - return TRUE; - } - --- -cgit v0.10.2 - Copied: upower/repos/extra-i686/fix-critical-action.patch (from rev 273018, upower/trunk/fix-critical-action.patch) =================================================================== --- extra-i686/fix-critical-action.patch (rev 0) +++ extra-i686/fix-critical-action.patch 2016-08-04 11:13:19 UTC (rev 273019) @@ -0,0 +1,28 @@ +From 28cee8e2845b094488c337c4ecfa84ada0b6be60 Mon Sep 17 00:00:00 2001 +From: Martin Pitt <martin.p...@ubuntu.com> +Date: Tue, 23 Feb 2016 09:51:07 +0100 +Subject: daemon: fix get_critical_action() + +Fix copy&paste error from e7e9156f that called the wrong _complete_ function +for up_daemon_get_critical_action(). + +https://bugs.freedesktop.org/show_bug.cgi?id=94262 + +diff --git a/src/up-daemon.c b/src/up-daemon.c +index be14cbe..e95f904 100644 +--- a/src/up-daemon.c ++++ b/src/up-daemon.c +@@ -435,8 +435,8 @@ up_daemon_get_critical_action (UpExportedDaemon *skeleton, + GDBusMethodInvocation *invocation, + UpDaemon *daemon) + { +- up_exported_daemon_complete_get_display_device (skeleton, invocation, +- up_backend_get_critical_action (daemon->priv->backend)); ++ up_exported_daemon_complete_get_critical_action (skeleton, invocation, ++ up_backend_get_critical_action (daemon->priv->backend)); + return TRUE; + } + +-- +cgit v0.10.2 + Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2016-08-04 11:13:15 UTC (rev 273018) +++ extra-x86_64/PKGBUILD 2016-08-04 11:13:19 UTC (rev 273019) @@ -1,39 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=upower -pkgver=0.99.4 -pkgrel=2 -pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" -arch=('i686' 'x86_64') -url="http://upower.freedesktop.org" -license=('GPL') -depends=('systemd' 'libusb' 'libimobiledevice' 'libgudev') -makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'python2') -backup=('etc/UPower/UPower.conf') -source=(http://upower.freedesktop.org/releases/$pkgname-$pkgver.tar.xz - fix-critical-action.patch) -sha256sums=('9ca325a6ccef505529b268ebbbd9becd0ce65a65f6ac7ee31e2e5b17648037b0' - '30c9e7587bd63f75d50f50f93bf97d9a80fc76f5ce875080487de04b2538beb4') - -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../fix-critical-action.patch -} - -build() { - cd $pkgname-$pkgver - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/$pkgname \ - --disable-static - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} Copied: upower/repos/extra-x86_64/PKGBUILD (from rev 273018, upower/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2016-08-04 11:13:19 UTC (rev 273019) @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=upower +pkgver=0.99.4+12+g402640b +pkgrel=1 +pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" +arch=('i686' 'x86_64') +url="http://upower.freedesktop.org" +license=('GPL') +depends=('systemd' 'libusb' 'libimobiledevice' 'libgudev') +makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'python2' 'git' 'gtk-doc') +backup=('etc/UPower/UPower.conf') +_commit=402640bee016472bf61c7a4ad9e5fac9790ea1bf +source=(git://anongit.freedesktop.org/upower#commit=$_commit) +md5sums=('SKIP') + +pkgver() { + cd $pkgname + git describe --tags | sed -e 's/UPOWER_//' -e 's/_/\./g' -e 's/-/+/g' +} + +build() { + cd $pkgname + + NOCONFIGURE=1 ./autogen.sh + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname \ + --disable-static + make +} + +package() { + cd $pkgname + make DESTDIR="$pkgdir" install +} Deleted: extra-x86_64/fix-critical-action.patch =================================================================== --- extra-x86_64/fix-critical-action.patch 2016-08-04 11:13:15 UTC (rev 273018) +++ extra-x86_64/fix-critical-action.patch 2016-08-04 11:13:19 UTC (rev 273019) @@ -1,28 +0,0 @@ -From 28cee8e2845b094488c337c4ecfa84ada0b6be60 Mon Sep 17 00:00:00 2001 -From: Martin Pitt <martin.p...@ubuntu.com> -Date: Tue, 23 Feb 2016 09:51:07 +0100 -Subject: daemon: fix get_critical_action() - -Fix copy&paste error from e7e9156f that called the wrong _complete_ function -for up_daemon_get_critical_action(). - -https://bugs.freedesktop.org/show_bug.cgi?id=94262 - -diff --git a/src/up-daemon.c b/src/up-daemon.c -index be14cbe..e95f904 100644 ---- a/src/up-daemon.c -+++ b/src/up-daemon.c -@@ -435,8 +435,8 @@ up_daemon_get_critical_action (UpExportedDaemon *skeleton, - GDBusMethodInvocation *invocation, - UpDaemon *daemon) - { -- up_exported_daemon_complete_get_display_device (skeleton, invocation, -- up_backend_get_critical_action (daemon->priv->backend)); -+ up_exported_daemon_complete_get_critical_action (skeleton, invocation, -+ up_backend_get_critical_action (daemon->priv->backend)); - return TRUE; - } - --- -cgit v0.10.2 - Copied: upower/repos/extra-x86_64/fix-critical-action.patch (from rev 273018, upower/trunk/fix-critical-action.patch) =================================================================== --- extra-x86_64/fix-critical-action.patch (rev 0) +++ extra-x86_64/fix-critical-action.patch 2016-08-04 11:13:19 UTC (rev 273019) @@ -0,0 +1,28 @@ +From 28cee8e2845b094488c337c4ecfa84ada0b6be60 Mon Sep 17 00:00:00 2001 +From: Martin Pitt <martin.p...@ubuntu.com> +Date: Tue, 23 Feb 2016 09:51:07 +0100 +Subject: daemon: fix get_critical_action() + +Fix copy&paste error from e7e9156f that called the wrong _complete_ function +for up_daemon_get_critical_action(). + +https://bugs.freedesktop.org/show_bug.cgi?id=94262 + +diff --git a/src/up-daemon.c b/src/up-daemon.c +index be14cbe..e95f904 100644 +--- a/src/up-daemon.c ++++ b/src/up-daemon.c +@@ -435,8 +435,8 @@ up_daemon_get_critical_action (UpExportedDaemon *skeleton, + GDBusMethodInvocation *invocation, + UpDaemon *daemon) + { +- up_exported_daemon_complete_get_display_device (skeleton, invocation, +- up_backend_get_critical_action (daemon->priv->backend)); ++ up_exported_daemon_complete_get_critical_action (skeleton, invocation, ++ up_backend_get_critical_action (daemon->priv->backend)); + return TRUE; + } + +-- +cgit v0.10.2 +