[arch-commits] Commit in upower/repos/extra-x86_64 (3 files)

[Jan de Groot]

    Date: Friday, December 15, 2017 @ 23:35:01
  Author: jgc
Revision: 312946

archrelease: copy trunk to extra-x86_64

Added:
  upower/repos/extra-x86_64/PKGBUILD
    (from rev 312945, upower/trunk/PKGBUILD)
Deleted:
  upower/repos/extra-x86_64/PKGBUILD
  upower/repos/extra-x86_64/fix-critical-action.patch

---------------------------+
 PKGBUILD                  |   80 ++++++++++++++++++++++----------------------
 fix-critical-action.patch |   28 ---------------
 2 files changed, 40 insertions(+), 68 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-15 23:34:42 UTC (rev 312945)
+++ PKGBUILD	2017-12-15 23:35:01 UTC (rev 312946)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=upower
-pkgver=0.99.6
-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=98d98fcbd039e66eb161d1d1e44d079a15ae2ef4  # tags/UPOWER_0_99_6^0
-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
-}

Copied: upower/repos/extra-x86_64/PKGBUILD (from rev 312945, upower/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-12-15 23:35:01 UTC (rev 312946)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=upower
+pkgver=0.99.7
+pkgrel=1
+pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
+arch=('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=b443f750cfeee460323d8d9f214ff691345d01ef  # tags/UPOWER_0_99_7^0
+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: fix-critical-action.patch
===================================================================
--- fix-critical-action.patch	2017-12-15 23:34:42 UTC (rev 312945)
+++ fix-critical-action.patch	2017-12-15 23:35:01 UTC (rev 312946)
@@ -1,28 +0,0 @@
-From 28cee8e2845b094488c337c4ecfa84ada0b6be60 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt at 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
-