r18280 - in /desktop/experimental/gnome-power-manager/debian: changelog patches/04_cast-align.patch patches/70_relibtoolize.patch patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Fri Jan 23 19:22:32 UTC 2009


Author: joss
Date: Fri Jan 23 19:22:31 2009
New Revision: 18280

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18280
Log:
* 04_cast-align.patch: new patch. Do not pass -Wcast-align, since 
  GStreamer does funny things that will confuse the Sparc compiler 
  while there is actually no loss of alignment. Closes: #510397.
* 70_relibtoolize.patch: regenerated.

Added:
    desktop/experimental/gnome-power-manager/debian/patches/04_cast-align.patch
Modified:
    desktop/experimental/gnome-power-manager/debian/changelog
    desktop/experimental/gnome-power-manager/debian/patches/70_relibtoolize.patch
    desktop/experimental/gnome-power-manager/debian/patches/series

Modified: desktop/experimental/gnome-power-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/changelog?rev=18280&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/changelog (original)
+++ desktop/experimental/gnome-power-manager/debian/changelog Fri Jan 23 19:22:31 2009
@@ -1,8 +1,15 @@
 gnome-power-manager (2.24.2-3) UNRELEASED; urgency=low
 
+  [ Sam Morris ]
   * 09-sensible-backlight-delta.patch: cope with backlights that have a lot of
     backlight levels when dimming due to being on battery power. Taken from
     upstream SVN revision 3142 (closes: #510268). 
+
+  [ Josselin Mouette ]
+  * 04_cast-align.patch: new patch. Do not pass -Wcast-align, since 
+    GStreamer does funny things that will confuse the Sparc compiler 
+    while there is actually no loss of alignment. Closes: #510397.
+  * 70_relibtoolize.patch: regenerated.
 
  -- Sam Morris <sam at robots.org.uk>  Sat, 03 Jan 2009 00:44:27 +0000
 

Added: desktop/experimental/gnome-power-manager/debian/patches/04_cast-align.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/patches/04_cast-align.patch?rev=18280&op=file
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/patches/04_cast-align.patch (added)
+++ desktop/experimental/gnome-power-manager/debian/patches/04_cast-align.patch Fri Jan 23 19:22:31 2009
@@ -1,0 +1,13 @@
+Index: gnome-power-manager-2.24.2/configure.ac
+===================================================================
+--- gnome-power-manager-2.24.2.orig/configure.ac	2009-01-23 20:18:29.149153375 +0100
++++ gnome-power-manager-2.24.2/configure.ac	2009-01-23 20:18:36.277156725 +0100
+@@ -22,7 +22,7 @@ dnl ------------------------------------
+ dnl - Extra verbose warning switches
+ dnl ---------------------------------------------------------------------------
+ if test "$GCC" = "yes"; then
+-    CPPFLAGS="$CPPFLAGS -Werror -Wcast-align -Wno-uninitialized"
++    CPPFLAGS="$CPPFLAGS -Werror -Wno-uninitialized"
+     CPPFLAGS="$CPPFLAGS -Wall -Wformat-security"
+ fi
+ 

Modified: desktop/experimental/gnome-power-manager/debian/patches/70_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/patches/70_relibtoolize.patch?rev=18280&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/patches/70_relibtoolize.patch (original)
+++ desktop/experimental/gnome-power-manager/debian/patches/70_relibtoolize.patch Fri Jan 23 19:22:31 2009
@@ -1,6 +1,7 @@
-diff -pruN gnome-power-manager-2.24.2.orig/aclocal.m4 gnome-power-manager-2.24.2/aclocal.m4
+Index: gnome-power-manager-2.24.2/aclocal.m4
+===================================================================
 --- gnome-power-manager-2.24.2.orig/aclocal.m4	2008-11-17 11:27:42.000000000 +0100
-+++ gnome-power-manager-2.24.2/aclocal.m4	2008-12-31 11:30:04.153887785 +0100
++++ gnome-power-manager-2.24.2/aclocal.m4	2009-01-23 20:20:55.292654156 +0100
 @@ -13,8 +13,8 @@
  
  m4_ifndef([AC_AUTOCONF_VERSION],
@@ -161,9 +162,10 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-diff -pruN gnome-power-manager-2.24.2.orig/applets/brightness/Makefile.in gnome-power-manager-2.24.2/applets/brightness/Makefile.in
+Index: gnome-power-manager-2.24.2/applets/brightness/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/applets/brightness/Makefile.in	2008-11-17 11:27:44.000000000 +0100
-+++ gnome-power-manager-2.24.2/applets/brightness/Makefile.in	2008-12-31 11:30:07.053887575 +0100
++++ gnome-power-manager-2.24.2/applets/brightness/Makefile.in	2009-01-23 20:20:55.292654156 +0100
 @@ -290,7 +290,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -172,9 +174,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  INCLUDES = \
-diff -pruN gnome-power-manager-2.24.2.orig/applets/inhibit/Makefile.in gnome-power-manager-2.24.2/applets/inhibit/Makefile.in
+Index: gnome-power-manager-2.24.2/applets/inhibit/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/applets/inhibit/Makefile.in	2008-11-17 11:27:44.000000000 +0100
-+++ gnome-power-manager-2.24.2/applets/inhibit/Makefile.in	2008-12-31 11:30:07.169888212 +0100
++++ gnome-power-manager-2.24.2/applets/inhibit/Makefile.in	2009-01-23 20:20:55.292654156 +0100
 @@ -289,7 +289,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -183,9 +186,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  INCLUDES = \
-diff -pruN gnome-power-manager-2.24.2.orig/applets/Makefile.in gnome-power-manager-2.24.2/applets/Makefile.in
+Index: gnome-power-manager-2.24.2/applets/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/applets/Makefile.in	2008-11-17 11:27:44.000000000 +0100
-+++ gnome-power-manager-2.24.2/applets/Makefile.in	2008-12-31 11:30:06.909887290 +0100
++++ gnome-power-manager-2.24.2/applets/Makefile.in	2009-01-23 20:20:55.292654156 +0100
 @@ -266,7 +266,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -194,9 +198,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  SUBDIRS = brightness inhibit
-diff -pruN gnome-power-manager-2.24.2.orig/config.guess gnome-power-manager-2.24.2/config.guess
+Index: gnome-power-manager-2.24.2/config.guess
+===================================================================
 --- gnome-power-manager-2.24.2.orig/config.guess	2008-09-22 22:46:14.000000000 +0200
-+++ gnome-power-manager-2.24.2/config.guess	2008-12-31 11:30:11.786389819 +0100
++++ gnome-power-manager-2.24.2/config.guess	2009-01-23 20:20:55.292654156 +0100
 @@ -4,7 +4,7 @@
  #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
  #   Free Software Foundation, Inc.
@@ -218,9 +223,10 @@
  
  If the version you run ($0) is already up to date, please
  send the following data and any information you think might be
-diff -pruN gnome-power-manager-2.24.2.orig/configure gnome-power-manager-2.24.2/configure
+Index: gnome-power-manager-2.24.2/configure
+===================================================================
 --- gnome-power-manager-2.24.2.orig/configure	2008-11-17 11:27:48.000000000 +0100
-+++ gnome-power-manager-2.24.2/configure	2008-12-31 11:30:13.230388358 +0100
++++ gnome-power-manager-2.24.2/configure	2009-01-23 20:21:01.537150104 +0100
 @@ -1,9 +1,9 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -8368,7 +8374,7 @@
      break 2
    fi
  done
-@@ -21149,11 +20966,11 @@ esac
+@@ -21149,17 +20966,17 @@ esac
  fi
  GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
  if test -n "$GLIB_GENMARSHAL"; then
@@ -8383,6 +8389,13 @@
 +echo "${ECHO_T}no" >&6; }
  fi
  
+ 
+ 
+ if test "$GCC" = "yes"; then
+-    CPPFLAGS="$CPPFLAGS -Werror -Wcast-align -Wno-uninitialized"
++    CPPFLAGS="$CPPFLAGS -Werror -Wno-uninitialized"
+     CPPFLAGS="$CPPFLAGS -Wall -Wformat-security"
+ fi
  
 @@ -21181,21 +20998,20 @@ _ACEOF
  
@@ -14365,9 +14378,10 @@
  
  
  echo "
-diff -pruN gnome-power-manager-2.24.2.orig/data/icons/16x16/actions/Makefile.in gnome-power-manager-2.24.2/data/icons/16x16/actions/Makefile.in
+Index: gnome-power-manager-2.24.2/data/icons/16x16/actions/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/icons/16x16/actions/Makefile.in	2008-11-17 11:27:44.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/icons/16x16/actions/Makefile.in	2008-12-31 11:30:07.505887899 +0100
++++ gnome-power-manager-2.24.2/data/icons/16x16/actions/Makefile.in	2009-01-23 20:20:55.344652384 +0100
 @@ -264,7 +264,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14376,9 +14390,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  themedir = $(pkgdatadir)/icons/hicolor
-diff -pruN gnome-power-manager-2.24.2.orig/data/icons/16x16/apps/Makefile.in gnome-power-manager-2.24.2/data/icons/16x16/apps/Makefile.in
+Index: gnome-power-manager-2.24.2/data/icons/16x16/apps/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/icons/16x16/apps/Makefile.in	2008-11-17 11:27:44.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/icons/16x16/apps/Makefile.in	2008-12-31 11:30:07.657889829 +0100
++++ gnome-power-manager-2.24.2/data/icons/16x16/apps/Makefile.in	2009-01-23 20:20:55.344652384 +0100
 @@ -264,7 +264,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14387,9 +14402,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  themedir = $(datadir)/icons/hicolor
-diff -pruN gnome-power-manager-2.24.2.orig/data/icons/16x16/Makefile.in gnome-power-manager-2.24.2/data/icons/16x16/Makefile.in
+Index: gnome-power-manager-2.24.2/data/icons/16x16/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/icons/16x16/Makefile.in	2008-11-17 11:27:44.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/icons/16x16/Makefile.in	2008-12-31 11:30:07.389887751 +0100
++++ gnome-power-manager-2.24.2/data/icons/16x16/Makefile.in	2009-01-23 20:20:55.344652384 +0100
 @@ -266,7 +266,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14398,9 +14414,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  SUBDIRS = actions apps status
-diff -pruN gnome-power-manager-2.24.2.orig/data/icons/16x16/status/Makefile.in gnome-power-manager-2.24.2/data/icons/16x16/status/Makefile.in
+Index: gnome-power-manager-2.24.2/data/icons/16x16/status/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/icons/16x16/status/Makefile.in	2008-11-17 11:27:44.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/icons/16x16/status/Makefile.in	2008-12-31 11:30:07.785887801 +0100
++++ gnome-power-manager-2.24.2/data/icons/16x16/status/Makefile.in	2009-01-23 20:20:55.344652384 +0100
 @@ -264,7 +264,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14409,9 +14426,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  themedir = $(pkgdatadir)/icons/hicolor
-diff -pruN gnome-power-manager-2.24.2.orig/data/icons/22x22/actions/Makefile.in gnome-power-manager-2.24.2/data/icons/22x22/actions/Makefile.in
+Index: gnome-power-manager-2.24.2/data/icons/22x22/actions/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/icons/22x22/actions/Makefile.in	2008-11-17 11:27:45.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/icons/22x22/actions/Makefile.in	2008-12-31 11:30:08.013889475 +0100
++++ gnome-power-manager-2.24.2/data/icons/22x22/actions/Makefile.in	2009-01-23 20:20:55.348654429 +0100
 @@ -264,7 +264,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14420,9 +14438,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  themedir = $(pkgdatadir)/icons/hicolor
-diff -pruN gnome-power-manager-2.24.2.orig/data/icons/22x22/apps/Makefile.in gnome-power-manager-2.24.2/data/icons/22x22/apps/Makefile.in
+Index: gnome-power-manager-2.24.2/data/icons/22x22/apps/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/icons/22x22/apps/Makefile.in	2008-11-17 11:27:45.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/icons/22x22/apps/Makefile.in	2008-12-31 11:30:08.133887268 +0100
++++ gnome-power-manager-2.24.2/data/icons/22x22/apps/Makefile.in	2009-01-23 20:20:55.348654429 +0100
 @@ -264,7 +264,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14431,9 +14450,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  themedir = $(datadir)/icons/hicolor
-diff -pruN gnome-power-manager-2.24.2.orig/data/icons/22x22/Makefile.in gnome-power-manager-2.24.2/data/icons/22x22/Makefile.in
+Index: gnome-power-manager-2.24.2/data/icons/22x22/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/icons/22x22/Makefile.in	2008-11-17 11:27:44.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/icons/22x22/Makefile.in	2008-12-31 11:30:07.901887949 +0100
++++ gnome-power-manager-2.24.2/data/icons/22x22/Makefile.in	2009-01-23 20:20:55.348654429 +0100
 @@ -266,7 +266,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14442,9 +14462,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  SUBDIRS = actions apps status
-diff -pruN gnome-power-manager-2.24.2.orig/data/icons/22x22/status/Makefile.in gnome-power-manager-2.24.2/data/icons/22x22/status/Makefile.in
+Index: gnome-power-manager-2.24.2/data/icons/22x22/status/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/icons/22x22/status/Makefile.in	2008-11-17 11:27:45.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/icons/22x22/status/Makefile.in	2008-12-31 11:30:08.253888483 +0100
++++ gnome-power-manager-2.24.2/data/icons/22x22/status/Makefile.in	2009-01-23 20:20:55.348654429 +0100
 @@ -264,7 +264,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14453,9 +14474,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  themedir = $(pkgdatadir)/icons/hicolor
-diff -pruN gnome-power-manager-2.24.2.orig/data/icons/24x24/actions/Makefile.in gnome-power-manager-2.24.2/data/icons/24x24/actions/Makefile.in
+Index: gnome-power-manager-2.24.2/data/icons/24x24/actions/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/icons/24x24/actions/Makefile.in	2008-11-17 11:27:45.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/icons/24x24/actions/Makefile.in	2008-12-31 11:30:08.493888469 +0100
++++ gnome-power-manager-2.24.2/data/icons/24x24/actions/Makefile.in	2009-01-23 20:20:55.348654429 +0100
 @@ -264,7 +264,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14464,9 +14486,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  themedir = $(pkgdatadir)/icons/hicolor
-diff -pruN gnome-power-manager-2.24.2.orig/data/icons/24x24/apps/Makefile.in gnome-power-manager-2.24.2/data/icons/24x24/apps/Makefile.in
+Index: gnome-power-manager-2.24.2/data/icons/24x24/apps/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/icons/24x24/apps/Makefile.in	2008-11-17 11:27:45.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/icons/24x24/apps/Makefile.in	2008-12-31 11:30:08.609887640 +0100
++++ gnome-power-manager-2.24.2/data/icons/24x24/apps/Makefile.in	2009-01-23 20:20:55.348654429 +0100
 @@ -264,7 +264,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14475,9 +14498,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  themedir = $(datadir)/icons/hicolor
-diff -pruN gnome-power-manager-2.24.2.orig/data/icons/24x24/Makefile.in gnome-power-manager-2.24.2/data/icons/24x24/Makefile.in
+Index: gnome-power-manager-2.24.2/data/icons/24x24/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/icons/24x24/Makefile.in	2008-11-17 11:27:45.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/icons/24x24/Makefile.in	2008-12-31 11:30:08.377888321 +0100
++++ gnome-power-manager-2.24.2/data/icons/24x24/Makefile.in	2009-01-23 20:20:55.352655008 +0100
 @@ -266,7 +266,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14486,9 +14510,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  SUBDIRS = actions apps status
-diff -pruN gnome-power-manager-2.24.2.orig/data/icons/24x24/status/Makefile.in gnome-power-manager-2.24.2/data/icons/24x24/status/Makefile.in
+Index: gnome-power-manager-2.24.2/data/icons/24x24/status/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/icons/24x24/status/Makefile.in	2008-11-17 11:27:45.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/icons/24x24/status/Makefile.in	2008-12-31 11:30:08.725887788 +0100
++++ gnome-power-manager-2.24.2/data/icons/24x24/status/Makefile.in	2009-01-23 20:20:55.352655008 +0100
 @@ -264,7 +264,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14497,9 +14522,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  themedir = $(pkgdatadir)/icons/hicolor
-diff -pruN gnome-power-manager-2.24.2.orig/data/icons/48x48/actions/Makefile.in gnome-power-manager-2.24.2/data/icons/48x48/actions/Makefile.in
+Index: gnome-power-manager-2.24.2/data/icons/48x48/actions/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/icons/48x48/actions/Makefile.in	2008-11-17 11:27:45.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/icons/48x48/actions/Makefile.in	2008-12-31 11:30:08.953887994 +0100
++++ gnome-power-manager-2.24.2/data/icons/48x48/actions/Makefile.in	2009-01-23 20:20:55.352655008 +0100
 @@ -264,7 +264,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14508,9 +14534,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  themedir = $(pkgdatadir)/icons/hicolor
-diff -pruN gnome-power-manager-2.24.2.orig/data/icons/48x48/apps/Makefile.in gnome-power-manager-2.24.2/data/icons/48x48/apps/Makefile.in
+Index: gnome-power-manager-2.24.2/data/icons/48x48/apps/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/icons/48x48/apps/Makefile.in	2008-11-17 11:27:45.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/icons/48x48/apps/Makefile.in	2008-12-31 11:30:09.069889609 +0100
++++ gnome-power-manager-2.24.2/data/icons/48x48/apps/Makefile.in	2009-01-23 20:20:55.352655008 +0100
 @@ -264,7 +264,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14519,9 +14546,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  themedir = $(datadir)/icons/hicolor
-diff -pruN gnome-power-manager-2.24.2.orig/data/icons/48x48/Makefile.in gnome-power-manager-2.24.2/data/icons/48x48/Makefile.in
+Index: gnome-power-manager-2.24.2/data/icons/48x48/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/icons/48x48/Makefile.in	2008-11-17 11:27:45.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/icons/48x48/Makefile.in	2008-12-31 11:30:08.837887847 +0100
++++ gnome-power-manager-2.24.2/data/icons/48x48/Makefile.in	2009-01-23 20:20:55.352655008 +0100
 @@ -266,7 +266,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14530,9 +14558,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  SUBDIRS = actions apps status
-diff -pruN gnome-power-manager-2.24.2.orig/data/icons/48x48/status/Makefile.in gnome-power-manager-2.24.2/data/icons/48x48/status/Makefile.in
+Index: gnome-power-manager-2.24.2/data/icons/48x48/status/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/icons/48x48/status/Makefile.in	2008-11-17 11:27:45.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/icons/48x48/status/Makefile.in	2008-12-31 11:30:09.193887491 +0100
++++ gnome-power-manager-2.24.2/data/icons/48x48/status/Makefile.in	2009-01-23 20:20:55.352655008 +0100
 @@ -264,7 +264,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14541,9 +14570,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  themedir = $(pkgdatadir)/icons/hicolor
-diff -pruN gnome-power-manager-2.24.2.orig/data/icons/Makefile.in gnome-power-manager-2.24.2/data/icons/Makefile.in
+Index: gnome-power-manager-2.24.2/data/icons/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/icons/Makefile.in	2008-11-17 11:27:45.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/icons/Makefile.in	2008-12-31 11:30:09.309887639 +0100
++++ gnome-power-manager-2.24.2/data/icons/Makefile.in	2009-01-23 20:20:55.356654119 +0100
 @@ -266,7 +266,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14552,9 +14582,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  SUBDIRS = scalable 16x16 22x22 24x24 48x48
-diff -pruN gnome-power-manager-2.24.2.orig/data/icons/scalable/actions/Makefile.in gnome-power-manager-2.24.2/data/icons/scalable/actions/Makefile.in
+Index: gnome-power-manager-2.24.2/data/icons/scalable/actions/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/icons/scalable/actions/Makefile.in	2008-11-17 11:27:46.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/icons/scalable/actions/Makefile.in	2008-12-31 11:30:09.537889802 +0100
++++ gnome-power-manager-2.24.2/data/icons/scalable/actions/Makefile.in	2009-01-23 20:20:55.356654119 +0100
 @@ -264,7 +264,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14563,9 +14594,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  themedir = $(pkgdatadir)/icons/hicolor
-diff -pruN gnome-power-manager-2.24.2.orig/data/icons/scalable/apps/Makefile.in gnome-power-manager-2.24.2/data/icons/scalable/apps/Makefile.in
+Index: gnome-power-manager-2.24.2/data/icons/scalable/apps/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/icons/scalable/apps/Makefile.in	2008-11-17 11:27:46.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/icons/scalable/apps/Makefile.in	2008-12-31 11:30:09.649887905 +0100
++++ gnome-power-manager-2.24.2/data/icons/scalable/apps/Makefile.in	2009-01-23 20:20:55.356654119 +0100
 @@ -264,7 +264,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14574,9 +14606,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  themedir = $(datadir)/icons/hicolor
-diff -pruN gnome-power-manager-2.24.2.orig/data/icons/scalable/Makefile.in gnome-power-manager-2.24.2/data/icons/scalable/Makefile.in
+Index: gnome-power-manager-2.24.2/data/icons/scalable/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/icons/scalable/Makefile.in	2008-11-17 11:27:46.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/icons/scalable/Makefile.in	2008-12-31 11:30:09.421887698 +0100
++++ gnome-power-manager-2.24.2/data/icons/scalable/Makefile.in	2009-01-23 20:20:55.356654119 +0100
 @@ -266,7 +266,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14585,9 +14618,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  SUBDIRS = actions apps status
-diff -pruN gnome-power-manager-2.24.2.orig/data/icons/scalable/status/Makefile.in gnome-power-manager-2.24.2/data/icons/scalable/status/Makefile.in
+Index: gnome-power-manager-2.24.2/data/icons/scalable/status/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/icons/scalable/status/Makefile.in	2008-11-17 11:27:46.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/icons/scalable/status/Makefile.in	2008-12-31 11:30:09.765887564 +0100
++++ gnome-power-manager-2.24.2/data/icons/scalable/status/Makefile.in	2009-01-23 20:20:55.356654119 +0100
 @@ -264,7 +264,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14596,9 +14630,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  themedir = $(pkgdatadir)/icons/hicolor
-diff -pruN gnome-power-manager-2.24.2.orig/data/Makefile.in gnome-power-manager-2.24.2/data/Makefile.in
+Index: gnome-power-manager-2.24.2/data/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/Makefile.in	2008-11-17 11:27:44.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/Makefile.in	2008-12-31 11:30:07.289887472 +0100
++++ gnome-power-manager-2.24.2/data/Makefile.in	2009-01-23 20:20:55.356654119 +0100
 @@ -288,7 +288,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14607,9 +14642,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  SUBDIRS = icons sounds
-diff -pruN gnome-power-manager-2.24.2.orig/data/sounds/Makefile.in gnome-power-manager-2.24.2/data/sounds/Makefile.in
+Index: gnome-power-manager-2.24.2/data/sounds/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/data/sounds/Makefile.in	2008-11-17 11:27:46.000000000 +0100
-+++ gnome-power-manager-2.24.2/data/sounds/Makefile.in	2008-12-31 11:30:09.881887711 +0100
++++ gnome-power-manager-2.24.2/data/sounds/Makefile.in	2009-01-23 20:20:55.356654119 +0100
 @@ -264,7 +264,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14618,9 +14654,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  EXTRA_DIST = \
-diff -pruN gnome-power-manager-2.24.2.orig/docs/Makefile.in gnome-power-manager-2.24.2/docs/Makefile.in
+Index: gnome-power-manager-2.24.2/docs/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/docs/Makefile.in	2008-11-17 11:27:46.000000000 +0100
-+++ gnome-power-manager-2.24.2/docs/Makefile.in	2008-12-31 11:30:09.993889725 +0100
++++ gnome-power-manager-2.24.2/docs/Makefile.in	2009-01-23 20:20:55.360653231 +0100
 @@ -264,7 +264,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14629,9 +14666,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  @DOCBOOK_DOCS_ENABLED_TRUE at htmldocdir = $(DOCDIR)/spec
-diff -pruN gnome-power-manager-2.24.2.orig/help/Makefile.in gnome-power-manager-2.24.2/help/Makefile.in
+Index: gnome-power-manager-2.24.2/help/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/help/Makefile.in	2008-11-17 11:27:46.000000000 +0100
-+++ gnome-power-manager-2.24.2/help/Makefile.in	2008-12-31 11:30:10.166387836 +0100
++++ gnome-power-manager-2.24.2/help/Makefile.in	2009-01-23 20:20:55.360653231 +0100
 @@ -279,7 +279,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14640,9 +14678,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-diff -pruN gnome-power-manager-2.24.2.orig/INSTALL gnome-power-manager-2.24.2/INSTALL
+Index: gnome-power-manager-2.24.2/INSTALL
+===================================================================
 --- gnome-power-manager-2.24.2.orig/INSTALL	2008-09-04 12:05:20.000000000 +0200
-+++ gnome-power-manager-2.24.2/INSTALL	2008-12-31 11:30:11.754389104 +0100
++++ gnome-power-manager-2.24.2/INSTALL	2009-01-23 20:20:55.360653231 +0100
 @@ -1,13 +1,19 @@
 -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
 -Foundation, Inc.
@@ -14861,9 +14900,10 @@
  
  `--help'
  `-h'
-diff -pruN gnome-power-manager-2.24.2.orig/libdbus-glib/Makefile.in gnome-power-manager-2.24.2/libdbus-glib/Makefile.in
+Index: gnome-power-manager-2.24.2/libdbus-glib/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/libdbus-glib/Makefile.in	2008-11-17 11:27:46.000000000 +0100
-+++ gnome-power-manager-2.24.2/libdbus-glib/Makefile.in	2008-12-31 11:30:10.330387590 +0100
++++ gnome-power-manager-2.24.2/libdbus-glib/Makefile.in	2009-01-23 20:20:55.360653231 +0100
 @@ -299,7 +299,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14872,9 +14912,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  INCLUDES = \
-diff -pruN gnome-power-manager-2.24.2.orig/libhal-glib/Makefile.in gnome-power-manager-2.24.2/libhal-glib/Makefile.in
+Index: gnome-power-manager-2.24.2/libhal-glib/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/libhal-glib/Makefile.in	2008-11-17 11:27:46.000000000 +0100
-+++ gnome-power-manager-2.24.2/libhal-glib/Makefile.in	2008-12-31 11:30:10.494389300 +0100
++++ gnome-power-manager-2.24.2/libhal-glib/Makefile.in	2009-01-23 20:20:55.360653231 +0100
 @@ -297,7 +297,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14883,9 +14924,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  INCLUDES = \
-diff -pruN gnome-power-manager-2.24.2.orig/libidletime/Makefile.in gnome-power-manager-2.24.2/libidletime/Makefile.in
+Index: gnome-power-manager-2.24.2/libidletime/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/libidletime/Makefile.in	2008-11-17 11:27:46.000000000 +0100
-+++ gnome-power-manager-2.24.2/libidletime/Makefile.in	2008-12-31 11:30:10.634388029 +0100
++++ gnome-power-manager-2.24.2/libidletime/Makefile.in	2009-01-23 20:20:55.364652831 +0100
 @@ -275,7 +275,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14894,9 +14936,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  INCLUDES = \
-diff -pruN gnome-power-manager-2.24.2.orig/libunique/Makefile.in gnome-power-manager-2.24.2/libunique/Makefile.in
+Index: gnome-power-manager-2.24.2/libunique/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/libunique/Makefile.in	2008-11-17 11:27:46.000000000 +0100
-+++ gnome-power-manager-2.24.2/libunique/Makefile.in	2008-12-31 11:30:10.778387826 +0100
++++ gnome-power-manager-2.24.2/libunique/Makefile.in	2009-01-23 20:20:55.364652831 +0100
 @@ -280,7 +280,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -14905,9 +14948,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  INCLUDES = \
-diff -pruN gnome-power-manager-2.24.2.orig/ltmain.sh gnome-power-manager-2.24.2/ltmain.sh
+Index: gnome-power-manager-2.24.2/ltmain.sh
+===================================================================
 --- gnome-power-manager-2.24.2.orig/ltmain.sh	2008-01-30 21:26:55.000000000 +0100
-+++ gnome-power-manager-2.24.2/ltmain.sh	2008-04-29 22:21:21.000000000 +0200
++++ gnome-power-manager-2.24.2/ltmain.sh	2009-01-23 20:20:55.368656343 +0100
 @@ -2,7 +2,7 @@
  # NOTE: Changing this file will not affect anything until you rerun configure.
  #
@@ -15101,9 +15145,10 @@
        do
  	eval "if test \"\${save_$lt_var+set}\" = set; then
  		$lt_var=\$save_$lt_var; export $lt_var
-diff -pruN gnome-power-manager-2.24.2.orig/Makefile.in gnome-power-manager-2.24.2/Makefile.in
+Index: gnome-power-manager-2.24.2/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/Makefile.in	2008-11-17 11:27:47.000000000 +0100
-+++ gnome-power-manager-2.24.2/Makefile.in	2008-12-31 11:30:11.866387696 +0100
++++ gnome-power-manager-2.24.2/Makefile.in	2009-01-23 20:20:55.368656343 +0100
 @@ -285,7 +285,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -15112,9 +15157,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  ACLOCAL_AMFLAGS = -I m4
-diff -pruN gnome-power-manager-2.24.2.orig/man/Makefile.in gnome-power-manager-2.24.2/man/Makefile.in
+Index: gnome-power-manager-2.24.2/man/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/man/Makefile.in	2008-11-17 11:27:47.000000000 +0100
-+++ gnome-power-manager-2.24.2/man/Makefile.in	2008-12-31 11:30:10.902388642 +0100
++++ gnome-power-manager-2.24.2/man/Makefile.in	2009-01-23 20:20:55.368656343 +0100
 @@ -258,7 +258,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -15123,9 +15169,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  EXTRA_DIST = \
-diff -pruN gnome-power-manager-2.24.2.orig/src/dbus/Makefile.in gnome-power-manager-2.24.2/src/dbus/Makefile.in
+Index: gnome-power-manager-2.24.2/src/dbus/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/src/dbus/Makefile.in	2008-11-17 11:27:47.000000000 +0100
-+++ gnome-power-manager-2.24.2/src/dbus/Makefile.in	2008-12-31 11:30:11.434388308 +0100
++++ gnome-power-manager-2.24.2/src/dbus/Makefile.in	2009-01-23 20:20:55.372655455 +0100
 @@ -254,7 +254,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -15134,9 +15181,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  NULL = 
-diff -pruN gnome-power-manager-2.24.2.orig/src/Makefile.in gnome-power-manager-2.24.2/src/Makefile.in
+Index: gnome-power-manager-2.24.2/src/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/src/Makefile.in	2008-11-17 11:27:47.000000000 +0100
-+++ gnome-power-manager-2.24.2/src/Makefile.in	2008-12-31 11:30:11.310392382 +0100
++++ gnome-power-manager-2.24.2/src/Makefile.in	2009-01-23 20:20:55.372655455 +0100
 @@ -401,7 +401,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -15145,9 +15193,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  SUBDIRS = dbus
-diff -pruN gnome-power-manager-2.24.2.orig/test/Makefile.in gnome-power-manager-2.24.2/test/Makefile.in
+Index: gnome-power-manager-2.24.2/test/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/test/Makefile.in	2008-11-17 11:27:47.000000000 +0100
-+++ gnome-power-manager-2.24.2/test/Makefile.in	2008-12-31 11:30:11.570388903 +0100
++++ gnome-power-manager-2.24.2/test/Makefile.in	2009-01-23 20:20:55.372655455 +0100
 @@ -281,7 +281,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -15156,9 +15205,10 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  NULL = 
-diff -pruN gnome-power-manager-2.24.2.orig/tools/Makefile.in gnome-power-manager-2.24.2/tools/Makefile.in
+Index: gnome-power-manager-2.24.2/tools/Makefile.in
+===================================================================
 --- gnome-power-manager-2.24.2.orig/tools/Makefile.in	2008-11-17 11:27:47.000000000 +0100
-+++ gnome-power-manager-2.24.2/tools/Makefile.in	2008-12-31 11:30:11.698387852 +0100
++++ gnome-power-manager-2.24.2/tools/Makefile.in	2009-01-23 20:20:55.372655455 +0100
 @@ -258,7 +258,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@

Modified: desktop/experimental/gnome-power-manager/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/patches/series?rev=18280&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/patches/series (original)
+++ desktop/experimental/gnome-power-manager/debian/patches/series Fri Jan 23 19:22:31 2009
@@ -1,6 +1,7 @@
 01-use-panel-logout.patch
 02_cast_align.patch
 03-system-policy.patch
+04_cast-align.patch
 06-bugreport-debian.patch
 07-bugreport-shebang.patch
 08-desktop-bugreport-path.patch




More information about the pkg-gnome-commits mailing list