r13875 - 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

[slomo at users.alioth.debian.org]

Author: slomo
Date: Sat Dec 15 05:08:50 2007
New Revision: 13875

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13875
Log:
* New upstream bugfix release:
  + debian/patches/73-getbrightness-returns-int.patch:
    - Updated to apply cleanly again, partially merged upstream.
  + debian/patches/71-fix-keyboard-brightness-keys.patch,
    debian/patches/72-fixbashizms.patch:
    - Dropped, merged upstream.
* debian/control.in:
  + Update Standards-Version to 3.7.3, no other changes needed.

Removed:
    desktop/unstable/gnome-power-manager/debian/patches/71-fix-keyboard-brightness-keys.patch
    desktop/unstable/gnome-power-manager/debian/patches/72-fixbashizms.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/patches/73-getbrightness-returns-int.patch

Modified: desktop/unstable/gnome-power-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/changelog?rev=13875&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/changelog (original)
+++ desktop/unstable/gnome-power-manager/debian/changelog Sat Dec 15 05:08:50 2007
@@ -1,3 +1,16 @@
+gnome-power-manager (2.20.2-1) unstable; urgency=low
+
+  * New upstream bugfix release:
+    + debian/patches/73-getbrightness-returns-int.patch:
+      - Updated to apply cleanly again, partially merged upstream.
+    + debian/patches/71-fix-keyboard-brightness-keys.patch,
+      debian/patches/72-fixbashizms.patch:
+      - Dropped, merged upstream.
+  * debian/control.in:
+    + Update Standards-Version to 3.7.3, no other changes needed.
+
+ -- Sebastian Dröge <slomo at debian.org>  Sat, 15 Dec 2007 04:42:54 +0100
+
 gnome-power-manager (2.20.1-1) unstable; urgency=low
 
   [ Josselin Mouette ]

Modified: desktop/unstable/gnome-power-manager/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/control?rev=13875&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/control (original)
+++ desktop/unstable/gnome-power-manager/debian/control Sat Dec 15 05:08:50 2007
@@ -4,7 +4,7 @@
 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>, Sebastian Dröge <slomo at debian.org>
 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
+Standards-Version: 3.7.3
 
 Package: gnome-power-manager
 Architecture: any

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=13875&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/control.in (original)
+++ desktop/unstable/gnome-power-manager/debian/control.in Sat Dec 15 05:08:50 2007
@@ -4,7 +4,7 @@
 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.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
+Standards-Version: 3.7.3
 
 Package: gnome-power-manager
 Architecture: any

Modified: 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=13875&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/patches/73-getbrightness-returns-int.patch (original)
+++ desktop/unstable/gnome-power-manager/debian/patches/73-getbrightness-returns-int.patch Sat Dec 15 05:08:50 2007
@@ -10,17 +10,3 @@
  				 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