Date: Sunday, September 9, 2012 @ 11:41:20 Author: heftig Revision: 166524
db-move: moved upower from [testing] to [extra] (i686, x86_64) Added: upower/repos/extra-i686/0001-Send-resume-signal-when-built-with-systemd-and-using.patch (from rev 166516, upower/repos/testing-i686/0001-Send-resume-signal-when-built-with-systemd-and-using.patch) upower/repos/extra-i686/PKGBUILD (from rev 166516, upower/repos/testing-i686/PKGBUILD) upower/repos/extra-x86_64/0001-Send-resume-signal-when-built-with-systemd-and-using.patch (from rev 166516, upower/repos/testing-x86_64/0001-Send-resume-signal-when-built-with-systemd-and-using.patch) upower/repos/extra-x86_64/PKGBUILD (from rev 166516, upower/repos/testing-x86_64/PKGBUILD) Deleted: upower/repos/extra-i686/PKGBUILD upower/repos/extra-x86_64/PKGBUILD upower/repos/testing-i686/ upower/repos/testing-x86_64/ ------------------------------------------------------------------------------+ extra-i686/0001-Send-resume-signal-when-built-with-systemd-and-using.patch | 35 ++++ extra-i686/PKGBUILD | 72 +++++----- extra-x86_64/0001-Send-resume-signal-when-built-with-systemd-and-using.patch | 35 ++++ extra-x86_64/PKGBUILD | 72 +++++----- 4 files changed, 146 insertions(+), 68 deletions(-) Copied: upower/repos/extra-i686/0001-Send-resume-signal-when-built-with-systemd-and-using.patch (from rev 166516, upower/repos/testing-i686/0001-Send-resume-signal-when-built-with-systemd-and-using.patch) =================================================================== --- extra-i686/0001-Send-resume-signal-when-built-with-systemd-and-using.patch (rev 0) +++ extra-i686/0001-Send-resume-signal-when-built-with-systemd-and-using.patch 2012-09-09 15:41:20 UTC (rev 166524) @@ -0,0 +1,35 @@ +From a5b3dd887dcd60e981626ae2e15c874311fc4fef Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Sun, 2 Sep 2012 04:36:13 +0200 +Subject: [PATCH] Send resume signal when built with systemd and using + pm-utils suspend + +This case was apparently overlooked when adding systemd support. + +Signed-off-by: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +--- + src/linux/up-backend.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c +index ddd4472..52b430e 100644 +--- a/src/linux/up-backend.c ++++ b/src/linux/up-backend.c +@@ -603,10 +603,11 @@ gboolean + up_backend_emits_resuming (UpBackend *backend) + { + #ifdef HAVE_SYSTEMD +- return TRUE; +-#else +- return FALSE; ++ if (sd_booted ()) ++ return TRUE; ++ else + #endif ++ return FALSE; + } + + /** +-- +1.7.12 + Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-09-09 15:41:15 UTC (rev 166523) +++ extra-i686/PKGBUILD 2012-09-09 15:41:20 UTC (rev 166524) @@ -1,34 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=upower -pkgver=0.9.17 -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-tools' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice') -makedepends=('intltool' 'docbook-xsl' 'gobject-introspection') -options=('!libtool') -source=($url/releases/$pkgname-$pkgver.tar.xz) - -build() { - cd "$pkgname-$pkgver" - - # put udev files in /usr/lib - sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/upower \ - --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --disable-static - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} -md5sums=('9ef7fc8ec438542f014f3a34552822aa') Copied: upower/repos/extra-i686/PKGBUILD (from rev 166516, upower/repos/testing-i686/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-09-09 15:41:20 UTC (rev 166524) @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=upower +pkgver=0.9.18 +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-tools' 'libsystemd' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice') +makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'systemd') +options=('!libtool') +source=($url/releases/$pkgname-$pkgver.tar.xz + 0001-Send-resume-signal-when-built-with-systemd-and-using.patch) +md5sums=('bfaaa1e7f8479fca5594406b3c36dff9' + '188afea4919dc324b2efbae35d9d216a') + +build() { + cd "$pkgname-$pkgver" + + # put udev files in /usr/lib + sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure + + # https://bugs.freedesktop.org/show_bug.cgi?id=54371 + patch -Np1 -i ../0001-Send-resume-signal-when-built-with-systemd-and-using.patch + + ./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/0001-Send-resume-signal-when-built-with-systemd-and-using.patch (from rev 166516, upower/repos/testing-x86_64/0001-Send-resume-signal-when-built-with-systemd-and-using.patch) =================================================================== --- extra-x86_64/0001-Send-resume-signal-when-built-with-systemd-and-using.patch (rev 0) +++ extra-x86_64/0001-Send-resume-signal-when-built-with-systemd-and-using.patch 2012-09-09 15:41:20 UTC (rev 166524) @@ -0,0 +1,35 @@ +From a5b3dd887dcd60e981626ae2e15c874311fc4fef Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Sun, 2 Sep 2012 04:36:13 +0200 +Subject: [PATCH] Send resume signal when built with systemd and using + pm-utils suspend + +This case was apparently overlooked when adding systemd support. + +Signed-off-by: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +--- + src/linux/up-backend.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c +index ddd4472..52b430e 100644 +--- a/src/linux/up-backend.c ++++ b/src/linux/up-backend.c +@@ -603,10 +603,11 @@ gboolean + up_backend_emits_resuming (UpBackend *backend) + { + #ifdef HAVE_SYSTEMD +- return TRUE; +-#else +- return FALSE; ++ if (sd_booted ()) ++ return TRUE; ++ else + #endif ++ return FALSE; + } + + /** +-- +1.7.12 + Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-09-09 15:41:15 UTC (rev 166523) +++ extra-x86_64/PKGBUILD 2012-09-09 15:41:20 UTC (rev 166524) @@ -1,34 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=upower -pkgver=0.9.17 -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-tools' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice') -makedepends=('intltool' 'docbook-xsl' 'gobject-introspection') -options=('!libtool') -source=($url/releases/$pkgname-$pkgver.tar.xz) - -build() { - cd "$pkgname-$pkgver" - - # put udev files in /usr/lib - sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/upower \ - --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --disable-static - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} -md5sums=('9ef7fc8ec438542f014f3a34552822aa') Copied: upower/repos/extra-x86_64/PKGBUILD (from rev 166516, upower/repos/testing-x86_64/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-09-09 15:41:20 UTC (rev 166524) @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=upower +pkgver=0.9.18 +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-tools' 'libsystemd' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice') +makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'systemd') +options=('!libtool') +source=($url/releases/$pkgname-$pkgver.tar.xz + 0001-Send-resume-signal-when-built-with-systemd-and-using.patch) +md5sums=('bfaaa1e7f8479fca5594406b3c36dff9' + '188afea4919dc324b2efbae35d9d216a') + +build() { + cd "$pkgname-$pkgver" + + # put udev files in /usr/lib + sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure + + # https://bugs.freedesktop.org/show_bug.cgi?id=54371 + patch -Np1 -i ../0001-Send-resume-signal-when-built-with-systemd-and-using.patch + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname \ + --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +}