Date: Friday, April 21, 2017 @ 12:58:58 Author: arodseth Revision: 224120
archrelease: copy trunk to community-any Added: oblogout/repos/community-any/PKGBUILD (from rev 224119, oblogout/trunk/PKGBUILD) oblogout/repos/community-any/oblogout.conf (from rev 224119, oblogout/trunk/oblogout.conf) oblogout/repos/community-any/oblogout.patch (from rev 224119, oblogout/trunk/oblogout.patch) oblogout/repos/community-any/ru.po (from rev 224119, oblogout/trunk/ru.po) Deleted: oblogout/repos/community-any/PKGBUILD oblogout/repos/community-any/oblogout.conf oblogout/repos/community-any/oblogout.patch oblogout/repos/community-any/ru.po ----------------+ PKGBUILD | 80 ++++++++++++------------ oblogout.conf | 56 ++++++++--------- oblogout.patch | 114 +++++++++++++++++------------------ ru.po | 178 +++++++++++++++++++++++++++---------------------------- 4 files changed, 214 insertions(+), 214 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2017-04-21 12:58:36 UTC (rev 224119) +++ PKGBUILD 2017-04-21 12:58:58 UTC (rev 224120) @@ -1,40 +0,0 @@ -# $Id$ -# Maintainer: Alexander Rødseth <rods...@gmail.com> -# Contributor: XaBz <xabz.2k5 gmail.com> - -pkgname=oblogout -pkgver=0.2 -pkgrel=17 -pkgdesc='Openbox logout script' -arch=('any') -url='https://launchpad.net/oblogout' -license=('GPL2') -depends=('pygtk' 'cairo' 'python2-pillow' 'python2-distutils-extra' 'dbus-python') -backup=(etc/oblogout.conf) -conflicts=('openboxlogout-gnome') -source=("http://launchpad.net/oblogout/$pkgver/$pkgver.0/+download/$pkgname-$pkgver.tar.bz2" - 'oblogout.patch' - "$pkgname.conf" - 'ru.po') -sha256sums=('f80003b85e9f4f1c588675453ea03f40a86fc50546d509ceb69706eb045782a9' - 'cea52a14df0ef924fcdd63b2e82c14b94cc2a7753994c176621ace9502bd9109' - '4a88dbe52d0fbb6563b689e22fde3face5934e25a4c4652d98b971025ca4ed2b' - 'aa8504055ec1e0661c3588cde85aad3267ffa7a42414c106e6ce8bff71f9d883') - -build() { - cd "$pkgname" - - patch -p0 -i ../oblogout.patch - sed -i 's/fromstring/frombytes/' oblogout/__init__.py # FS#46587 - sed -i '0,/on/s//on2/' "$pkgname"/*.py - cp "$srcdir/ru.po" po -} - -package() { - cd "$pkgname" - - python2 setup.py install --root="$pkgdir" - install -m644 "$srcdir/oblogout.conf" "$pkgdir/etc/" -} - -# vim:set ts=2 sw=2 et: Copied: oblogout/repos/community-any/PKGBUILD (from rev 224119, oblogout/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-04-21 12:58:58 UTC (rev 224120) @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: Alexander F Rødseth <xypr...@archlinux.org> +# Contributor: XaBz <xabz....@gmail.com> + +pkgname=oblogout +pkgver=0.2 +pkgrel=18 +pkgdesc='Openbox logout script' +arch=('any') +url='https://launchpad.net/oblogout' +license=('GPL2') +depends=('pygtk' 'cairo' 'python2-pillow' 'python2-distutils-extra' 'dbus-python') +backup=('etc/oblogout.conf') +conflicts=('openboxlogout-gnome') +source=("https://launchpad.net/oblogout/$pkgver/$pkgver.0/+download/$pkgname-$pkgver.tar.bz2" + 'oblogout.patch' + "$pkgname.conf" + 'ru.po') +sha256sums=('f80003b85e9f4f1c588675453ea03f40a86fc50546d509ceb69706eb045782a9' + 'cea52a14df0ef924fcdd63b2e82c14b94cc2a7753994c176621ace9502bd9109' + '4a88dbe52d0fbb6563b689e22fde3face5934e25a4c4652d98b971025ca4ed2b' + 'aa8504055ec1e0661c3588cde85aad3267ffa7a42414c106e6ce8bff71f9d883') + +prepare() { + cd "$pkgname" + + patch -p0 -i ../oblogout.patch + sed -i 's/fromstring/frombytes/' oblogout/__init__.py # FS#46587 + sed -i '0,/on/s//on2/' "$pkgname"/*.py + cp "$srcdir/ru.po" po +} + +package() { + cd "$pkgname" + + python2 setup.py install --root="$pkgdir" + install -m644 "$srcdir/oblogout.conf" "$pkgdir/etc/" +} + +# vim:set ts=2 sw=2 et: Deleted: oblogout.conf =================================================================== --- oblogout.conf 2017-04-21 12:58:36 UTC (rev 224119) +++ oblogout.conf 2017-04-21 12:58:58 UTC (rev 224120) @@ -1,28 +0,0 @@ -[settings] -usehal = false - -[looks] -opacity = 70 -bgcolor = black -buttontheme = oxygen -buttons = cancel, logout, restart, shutdown, suspend, hibernate, lock - -[shortcuts] -cancel = Escape -shutdown = S -restart = R -suspend = U -logout = L -lock = K -hibernate = H - -[commands] -shutdown = systemctl poweroff -restart = systemctl reboot -suspend = systemctl suspend -hibernate = systemctl hibernate -logout = openbox --exit -lock = xtrlock & -#switchuser = gdm-control --switch-user -#safesuspend = safesuspend - Copied: oblogout/repos/community-any/oblogout.conf (from rev 224119, oblogout/trunk/oblogout.conf) =================================================================== --- oblogout.conf (rev 0) +++ oblogout.conf 2017-04-21 12:58:58 UTC (rev 224120) @@ -0,0 +1,28 @@ +[settings] +usehal = false + +[looks] +opacity = 70 +bgcolor = black +buttontheme = oxygen +buttons = cancel, logout, restart, shutdown, suspend, hibernate, lock + +[shortcuts] +cancel = Escape +shutdown = S +restart = R +suspend = U +logout = L +lock = K +hibernate = H + +[commands] +shutdown = systemctl poweroff +restart = systemctl reboot +suspend = systemctl suspend +hibernate = systemctl hibernate +logout = openbox --exit +lock = xtrlock & +#switchuser = gdm-control --switch-user +#safesuspend = safesuspend + Deleted: oblogout.patch =================================================================== --- oblogout.patch 2017-04-21 12:58:36 UTC (rev 224119) +++ oblogout.patch 2017-04-21 12:58:58 UTC (rev 224120) @@ -1,57 +0,0 @@ ---- oblogout/__init__.py 2009-04-13 16:48:11.000000000 -0400 -+++ da/oblogout/__init__.py 2010-10-19 14:38:29.000000000 -0300 -@@ -222,8 +222,8 @@ class OpenboxLogout(): - if self.parser.has_section("commands"): - for key in self.parser.items("commands"): - self.logger.debug("Setting cmd_%s as %s" % (key[0], key[1])) -- if key[1] in ['logout', 'restart', 'shutdown', 'suspend', 'hibernate', 'safesuspend', 'lock', 'switch']: -- if key[1]: setattr(self, "cmd_" + key[0], key[1]) -+ if key[0] in ['logout', 'restart', 'shutdown', 'suspend', 'hibernate', 'safesuspend', 'lock', 'switch']: -+ if key[0]: setattr(self, "cmd_" + key[0], key[1]) - - # Load theme information from local directory if local mode is set - if self.local_mode: ---- oblogout/__init__.py 2012-03-05 14:51:08.000000000 +0100 -+++ __init__.py 2012-03-05 20:43:49.185068877 +0100 -@@ -176,6 +176,7 @@ - self.parser.read(config) - - # Set some safe defaults -+ self.lock_before_suspend = False - self.opacity = 50 - self.button_theme = "default" - self.bgcolor = gtk.gdk.color_parse("black") -@@ -188,6 +189,9 @@ - self.usehal = self.parser.getboolean("settings","usehal") - else: - self.usehal = True -+ -+ if self.parser.has_option("settings","lock_before_suspend"): -+ self.lock_before_suspend = self.parser.getboolean("settings","lock_before_suspend") - - if self.usehal: - from dbushandler import DbusController -@@ -363,7 +367,10 @@ - - elif (data == 'suspend'): - self.window.hide() -- self.__exec_cmd(self.cmd_lock) -+ -+ if(self.lock_before_suspend): -+ self.__exec_cmd(self.cmd_lock) -+ - if self.usehal: - self.dbus.suspend() - -@@ -372,7 +379,10 @@ - - elif (data == 'hibernate'): - self.window.hide() -- self.__exec_cmd(self.cmd_lock) -+ -+ if(self.lock_before_suspend): -+ self.__exec_cmd(self.cmd_lock) -+ - if self.usehal: - self.dbus.hibernate() - else: Copied: oblogout/repos/community-any/oblogout.patch (from rev 224119, oblogout/trunk/oblogout.patch) =================================================================== --- oblogout.patch (rev 0) +++ oblogout.patch 2017-04-21 12:58:58 UTC (rev 224120) @@ -0,0 +1,57 @@ +--- oblogout/__init__.py 2009-04-13 16:48:11.000000000 -0400 ++++ da/oblogout/__init__.py 2010-10-19 14:38:29.000000000 -0300 +@@ -222,8 +222,8 @@ class OpenboxLogout(): + if self.parser.has_section("commands"): + for key in self.parser.items("commands"): + self.logger.debug("Setting cmd_%s as %s" % (key[0], key[1])) +- if key[1] in ['logout', 'restart', 'shutdown', 'suspend', 'hibernate', 'safesuspend', 'lock', 'switch']: +- if key[1]: setattr(self, "cmd_" + key[0], key[1]) ++ if key[0] in ['logout', 'restart', 'shutdown', 'suspend', 'hibernate', 'safesuspend', 'lock', 'switch']: ++ if key[0]: setattr(self, "cmd_" + key[0], key[1]) + + # Load theme information from local directory if local mode is set + if self.local_mode: +--- oblogout/__init__.py 2012-03-05 14:51:08.000000000 +0100 ++++ __init__.py 2012-03-05 20:43:49.185068877 +0100 +@@ -176,6 +176,7 @@ + self.parser.read(config) + + # Set some safe defaults ++ self.lock_before_suspend = False + self.opacity = 50 + self.button_theme = "default" + self.bgcolor = gtk.gdk.color_parse("black") +@@ -188,6 +189,9 @@ + self.usehal = self.parser.getboolean("settings","usehal") + else: + self.usehal = True ++ ++ if self.parser.has_option("settings","lock_before_suspend"): ++ self.lock_before_suspend = self.parser.getboolean("settings","lock_before_suspend") + + if self.usehal: + from dbushandler import DbusController +@@ -363,7 +367,10 @@ + + elif (data == 'suspend'): + self.window.hide() +- self.__exec_cmd(self.cmd_lock) ++ ++ if(self.lock_before_suspend): ++ self.__exec_cmd(self.cmd_lock) ++ + if self.usehal: + self.dbus.suspend() + +@@ -372,7 +379,10 @@ + + elif (data == 'hibernate'): + self.window.hide() +- self.__exec_cmd(self.cmd_lock) ++ ++ if(self.lock_before_suspend): ++ self.__exec_cmd(self.cmd_lock) ++ + if self.usehal: + self.dbus.hibernate() + else: Deleted: ru.po =================================================================== --- ru.po 2017-04-21 12:58:36 UTC (rev 224119) +++ ru.po 2017-04-21 12:58:58 UTC (rev 224120) @@ -1,89 +0,0 @@ -# Russian translation for oblogout -# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 -# This file is distributed under the same license as the oblogout package. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2009. -# -msgid "" -msgstr "" -"Project-Id-Version: oblogout\n" -"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-01-26 23:21+0000\n" -"PO-Revision-Date: 2011-03-09 20:07+0300\n" -"Last-Translator: Влад <zookeepe...@gmail.com>\n" -"Language-Team: Greek <e...@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-02-01 22:36+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#: ../ObLogout/oblogout.py:88 -msgid "Openbox Logout" -msgstr "Openbox Logout" - -#: ../ObLogout/oblogout.py:178 -msgid "Unable to determin the module path, exiting..." -msgstr "Невозможно определить путь к модулю, выход..." - -#: ../ObLogout/oblogout.py:213 -#, python-format -msgid "Color %s is not a valid color, defaulting to black" -msgstr "Цвет %s не является допустимым цветом, используется черный по умолчанию" - -#: ../ObLogout/oblogout.py:235 -msgid "cancel" -msgstr "Отмена" - -#: ../ObLogout/oblogout.py:235 -msgid "logout" -msgstr "Выход" - -#: ../ObLogout/oblogout.py:235 -msgid "restart" -msgstr "Перезагрузка" - -#: ../ObLogout/oblogout.py:235 -msgid "shutdown" -msgstr "Выключение" - -#: ../ObLogout/oblogout.py:235 -msgid "suspend" -msgstr "Ожидание" - -#: ../ObLogout/oblogout.py:235 -msgid "hibernate" -msgstr "Сон" - -#: ../ObLogout/oblogout.py:235 -msgid "safesuspend" -msgstr "Безопасное ожидание" - -#: ../ObLogout/oblogout.py:235 -msgid "lock" -msgstr "Блокировка" - -#: ../ObLogout/oblogout.py:235 -msgid "switch" -msgstr "Переключение" - -#: ../ObLogout/oblogout.py:247 -#, python-format -msgid "Button %s is not a valid button name, removing" -msgstr "Кнопка %s не является допустимым именем кнопки, удаление..." - -#: ../ObLogout/oblogout.py:252 -msgid "Can't Suspend, disabling button" -msgstr "Невозможно перейти в режим ожидания, отключение кнопки" - -#: ../ObLogout/oblogout.py:256 -msgid "Can't Hibernate, disabling button" -msgstr "Невозможно перейти в режим сна, отключение кнопки" - -#: ../ObLogout/oblogout.py:260 -msgid "Can't Safe Suspend, disabling button" -msgstr "Невозможно перейти в режим безопасного ожидания, отключение кнопки" - -#: ../ObLogout/oblogout.py:264 -msgid "No valid buttons found, resetting to defaults" -msgstr "Не найдена подходящая кнопка, возвращение к стандартным настройкам" - Copied: oblogout/repos/community-any/ru.po (from rev 224119, oblogout/trunk/ru.po) =================================================================== --- ru.po (rev 0) +++ ru.po 2017-04-21 12:58:58 UTC (rev 224120) @@ -0,0 +1,89 @@ +# Russian translation for oblogout +# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 +# This file is distributed under the same license as the oblogout package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: oblogout\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2009-01-26 23:21+0000\n" +"PO-Revision-Date: 2011-03-09 20:07+0300\n" +"Last-Translator: Влад <zookeepe...@gmail.com>\n" +"Language-Team: Greek <e...@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-02-01 22:36+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#: ../ObLogout/oblogout.py:88 +msgid "Openbox Logout" +msgstr "Openbox Logout" + +#: ../ObLogout/oblogout.py:178 +msgid "Unable to determin the module path, exiting..." +msgstr "Невозможно определить путь к модулю, выход..." + +#: ../ObLogout/oblogout.py:213 +#, python-format +msgid "Color %s is not a valid color, defaulting to black" +msgstr "Цвет %s не является допустимым цветом, используется черный по умолчанию" + +#: ../ObLogout/oblogout.py:235 +msgid "cancel" +msgstr "Отмена" + +#: ../ObLogout/oblogout.py:235 +msgid "logout" +msgstr "Выход" + +#: ../ObLogout/oblogout.py:235 +msgid "restart" +msgstr "Перезагрузка" + +#: ../ObLogout/oblogout.py:235 +msgid "shutdown" +msgstr "Выключение" + +#: ../ObLogout/oblogout.py:235 +msgid "suspend" +msgstr "Ожидание" + +#: ../ObLogout/oblogout.py:235 +msgid "hibernate" +msgstr "Сон" + +#: ../ObLogout/oblogout.py:235 +msgid "safesuspend" +msgstr "Безопасное ожидание" + +#: ../ObLogout/oblogout.py:235 +msgid "lock" +msgstr "Блокировка" + +#: ../ObLogout/oblogout.py:235 +msgid "switch" +msgstr "Переключение" + +#: ../ObLogout/oblogout.py:247 +#, python-format +msgid "Button %s is not a valid button name, removing" +msgstr "Кнопка %s не является допустимым именем кнопки, удаление..." + +#: ../ObLogout/oblogout.py:252 +msgid "Can't Suspend, disabling button" +msgstr "Невозможно перейти в режим ожидания, отключение кнопки" + +#: ../ObLogout/oblogout.py:256 +msgid "Can't Hibernate, disabling button" +msgstr "Невозможно перейти в режим сна, отключение кнопки" + +#: ../ObLogout/oblogout.py:260 +msgid "Can't Safe Suspend, disabling button" +msgstr "Невозможно перейти в режим безопасного ожидания, отключение кнопки" + +#: ../ObLogout/oblogout.py:264 +msgid "No valid buttons found, resetting to defaults" +msgstr "Не найдена подходящая кнопка, возвращение к стандартным настройкам" +