r12714 - in /desktop/unstable/gnome-power-manager/debian: changelog control control.in patches/71-fix-keyboard-brightness-keys.patch patches/72-fixbashizms.patch patches/73-getbrightness-returns-int.patch rules
giskard at users.alioth.debian.org
giskard at users.alioth.debian.org
Sat Sep 22 10:07:43 UTC 2007
Author: giskard
Date: Sat Sep 22 10:07:43 2007
New Revision: 12714
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12714
Log:
new upstream release
Added:
desktop/unstable/gnome-power-manager/debian/patches/71-fix-keyboard-brightness-keys.patch
desktop/unstable/gnome-power-manager/debian/patches/72-fixbashizms.patch
desktop/unstable/gnome-power-manager/debian/patches/73-getbrightness-returns-int.patch
Modified:
desktop/unstable/gnome-power-manager/debian/changelog
desktop/unstable/gnome-power-manager/debian/control
desktop/unstable/gnome-power-manager/debian/control.in
desktop/unstable/gnome-power-manager/debian/rules
Modified: desktop/unstable/gnome-power-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/changelog?rev=12714&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/changelog (original)
+++ desktop/unstable/gnome-power-manager/debian/changelog Sat Sep 22 10:07:43 2007
@@ -1,3 +1,14 @@
+gnome-power-manager (2.20.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Added patches:
+ 71-fix-keyboard-brightness-keys.patch
+ 72-fixbashizms.patch
+ 73-getbrightness-returns-int.patch
+ taken from the Ubuntu package.
+
+ -- Riccardo Setti <giskard at debian.org> Sat, 22 Sep 2007 11:19:01 +0200
+
gnome-power-manager (2.18.3-1) unstable; urgency=low
* New upstream stable release.
Modified: desktop/unstable/gnome-power-manager/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/control?rev=12714&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/control (original)
+++ desktop/unstable/gnome-power-manager/debian/control Sat Sep 22 10:07:43 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Riccardo Setti <giskard at debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, autotools-dev, libtool, autoconf, libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libhal-dev (>= 0.5.6), libdbus-glib-1-dev (>= 0.61), libxml-parser-perl, libxext-dev, libx11-dev, libgtk2.0-dev (>= 2.10), libwnck-dev (>= 2.10), docbook-to-man, intltool, libnotify-dev (>= 0.4.4-3), docbook-utils, libxres-dev, xmlto, gnome-doc-utils, scrollkeeper, gnome-pkg-tools (>= 0.10)
+Build-Depends: debhelper (>= 5), cdbs, autotools-dev, libtool, autoconf, libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libhal-dev (>= 0.5.8), libdbus-glib-1-dev (>= 0.70), libxml-parser-perl, libxext-dev, libx11-dev, libgtk2.0-dev (>= 2.11), libwnck-dev (>= 2.10), docbook-to-man, intltool, libnotify-dev (>= 0.4.4-3), docbook-utils, libxres-dev, xmlto, gnome-doc-utils, scrollkeeper, gnome-pkg-tools (>= 0.10), libgstreamer0.10-dev
Standards-Version: 3.7.2
Package: gnome-power-manager
Modified: desktop/unstable/gnome-power-manager/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/control.in?rev=12714&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/control.in (original)
+++ desktop/unstable/gnome-power-manager/debian/control.in Sat Sep 22 10:07:43 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Riccardo Setti <giskard at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 5), cdbs, autotools-dev, libtool, autoconf, libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libhal-dev (>= 0.5.6), libdbus-glib-1-dev (>= 0.61), libxml-parser-perl, libxext-dev, libx11-dev, libgtk2.0-dev (>= 2.10), libwnck-dev (>= 2.10), docbook-to-man, intltool, libnotify-dev (>= 0.4.4-3), docbook-utils, libxres-dev, xmlto, gnome-doc-utils, scrollkeeper, gnome-pkg-tools (>= 0.10)
+Build-Depends: debhelper (>= 5), cdbs, autotools-dev, libtool, autoconf, libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libhal-dev (>= 0.5.8), libdbus-glib-1-dev (>= 0.70), libxml-parser-perl, libxext-dev, libx11-dev, libgtk2.0-dev (>= 2.11), libwnck-dev (>= 2.10), docbook-to-man, intltool, libnotify-dev (>= 0.4.4-3), docbook-utils, libxres-dev, xmlto, gnome-doc-utils, scrollkeeper, gnome-pkg-tools (>= 0.10), libgstreamer0.10-dev
Standards-Version: 3.7.2
Package: gnome-power-manager
Added: desktop/unstable/gnome-power-manager/debian/patches/71-fix-keyboard-brightness-keys.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/patches/71-fix-keyboard-brightness-keys.patch?rev=12714&op=file
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/patches/71-fix-keyboard-brightness-keys.patch (added)
+++ desktop/unstable/gnome-power-manager/debian/patches/71-fix-keyboard-brightness-keys.patch Sat Sep 22 10:07:43 2007
@@ -1,0 +1,12 @@
+diff -ur src.bak/gpm-srv-brightness-kbd.c src/gpm-srv-brightness-kbd.c
+--- a/src.bak/gpm-srv-brightness-kbd.c 2007-03-04 17:35:32.000000000 +0000
++++ b/src/gpm-srv-brightness-kbd.c 2007-04-02 21:16:40.000000000 +0100
+@@ -144,7 +144,7 @@
+ if ((strcmp (type, GPM_BUTTON_KBD_BRIGHT_UP) == 0)) {
+ gpm_brightness_kbd_up (srv_brightness->priv->brightness);
+
+- } else if ((strcmp (type, GPM_BUTTON_KBD_BRIGHT_UP) == 0)) {
++ } else if ((strcmp (type, GPM_BUTTON_KBD_BRIGHT_DOWN) == 0)) {
+ gpm_brightness_kbd_down (srv_brightness->priv->brightness);
+
+ } else if (strcmp (type, GPM_BUTTON_KBD_BRIGHT_TOGGLE) == 0) {
Added: desktop/unstable/gnome-power-manager/debian/patches/72-fixbashizms.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/patches/72-fixbashizms.patch?rev=12714&op=file
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/patches/72-fixbashizms.patch (added)
+++ desktop/unstable/gnome-power-manager/debian/patches/72-fixbashizms.patch Sat Sep 22 10:07:43 2007
@@ -1,0 +1,33 @@
+diff -Nur gnome-power-manager-2.19.6/tools/gnome-power-cmd.sh gnome-power-manager-2.19.6.new/tools/gnome-power-cmd.sh
+--- gnome-power-manager-2.19.6/tools/gnome-power-cmd.sh 2007-07-19 01:48:02.000000000 +0200
++++ gnome-power-manager-2.19.6.new/tools/gnome-power-cmd.sh 2007-08-06 11:53:26.691908267 +0200
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ # Copyright (C) 2007 Richard Hughes <richard at hughsie.com>
+ #
+ # Licensed under the GNU General Public License Version 2
+@@ -24,19 +25,19 @@
+ fi
+ }
+
+-if [ "$1" == "suspend" ]; then
++if [ "$1" = "suspend" ]; then
+ echo "Suspending"
+ execute_dbus_method "Suspend"
+-elif [ "$1" == "hibernate" ]; then
++elif [ "$1" = "hibernate" ]; then
+ echo "Hibernating"
+ execute_dbus_method "Hibernate"
+-elif [ "$1" == "reboot" ]; then
++elif [ "$1" = "reboot" ]; then
+ echo "Rebooting"
+ execute_dbus_method "Reboot"
+-elif [ "$1" == "shutdown" ]; then
++elif [ "$1" = "shutdown" ]; then
+ echo "Shutting down"
+ execute_dbus_method "Shutdown"
+-elif [ "$1" == "" ]; then
++elif [ "$1" = "" ]; then
+ echo "command required: suspend, shutdown, hibernate or reboot"
+ else
+ echo "command '$1' not recognised, only suspend, shutdown, hibernate or reboot are valid"
Added: desktop/unstable/gnome-power-manager/debian/patches/73-getbrightness-returns-int.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/patches/73-getbrightness-returns-int.patch?rev=12714&op=file
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/patches/73-getbrightness-returns-int.patch (added)
+++ desktop/unstable/gnome-power-manager/debian/patches/73-getbrightness-returns-int.patch Sat Sep 22 10:07:43 2007
@@ -1,0 +1,26 @@
+diff -ur gnome-power-manager-2.19.6.clean/src/gpm-brightness-kbd.c gnome-power-manager-2.19.6/src/gpm-brightness-kbd.c
+--- gnome-power-manager-2.19.6.clean/src/gpm-brightness-kbd.c 2007-06-01 09:16:08.000000000 +0100
++++ gnome-power-manager-2.19.6/src/gpm-brightness-kbd.c 2007-08-29 22:23:50.000000000 +0100
+@@ -105,7 +105,7 @@
+
+ ret = dbus_g_proxy_call (proxy, "GetBrightness", &error,
+ G_TYPE_INVALID,
+- G_TYPE_UINT, brightness_level_hw,
++ G_TYPE_INT, brightness_level_hw,
+ G_TYPE_INVALID);
+ if (error) {
+ gpm_debug ("ERROR: %s", error->message);
+diff -ur gnome-power-manager-2.19.6.clean/src/gpm-brightness-lcd.c gnome-power-manager-2.19.6/src/gpm-brightness-lcd.c
+--- gnome-power-manager-2.19.6.clean/src/gpm-brightness-lcd.c 2007-07-26 18:49:33.000000000 +0100
++++ gnome-power-manager-2.19.6/src/gpm-brightness-lcd.c 2007-08-29 22:23:35.000000000 +0100
+@@ -97,7 +97,7 @@
+
+ ret = dbus_g_proxy_call (proxy, "GetBrightness", &error,
+ G_TYPE_INVALID,
+- G_TYPE_UINT, &level,
++ G_TYPE_INT, &level,
+ G_TYPE_INVALID);
+
+ if (brightness_level_hw != NULL) {
+Only in gnome-power-manager-2.19.6.clean/src: gpm-marshal.c
+Only in gnome-power-manager-2.19.6.clean/src: gpm-marshal.h
Modified: desktop/unstable/gnome-power-manager/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/rules?rev=12714&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/rules (original)
+++ desktop/unstable/gnome-power-manager/debian/rules Sat Sep 22 10:07:43 2007
@@ -13,8 +13,10 @@
--with-dpms-ext \
--with-dbus-services=/usr/share/dbus-1/services/ \
--disable-scrollkeeper \
- --with-doc-dir=/usr/share/doc/gnome-power-manager/
-
+ --with-doc-dir=/usr/share/doc/gnome-power-manager/ \
+ --disable-policykit \
+ --enable-checkfg
+
clean::
rm -f po/*.gmo
More information about the pkg-gnome-commits
mailing list