r21783 - in /desktop/experimental/gnome-power-manager/debian: ./ patches/

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Sun Oct 4 21:43:01 UTC 2009


Author: biebl
Date: Sun Oct  4 21:43:01 2009
New Revision: 21783

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21783
Log:
* Drop patches
  - debian/patches/03-system-policy.patch (merged upstream)
  - debian/patches/07-bugreport-shebang.patch (merged upstream)
* Refresh all patches.

Removed:
    desktop/experimental/gnome-power-manager/debian/patches/03-system-policy.patch
    desktop/experimental/gnome-power-manager/debian/patches/07-bugreport-shebang.patch
Modified:
    desktop/experimental/gnome-power-manager/debian/changelog
    desktop/experimental/gnome-power-manager/debian/patches/02_autostart_init.patch
    desktop/experimental/gnome-power-manager/debian/patches/04_cast-align.patch
    desktop/experimental/gnome-power-manager/debian/patches/06-bugreport-debian.patch
    desktop/experimental/gnome-power-manager/debian/patches/08-desktop-bugreport-path.patch
    desktop/experimental/gnome-power-manager/debian/patches/90_autoconf.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=21783&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-power-manager/debian/changelog [utf-8] Sun Oct  4 21:43:01 2009
@@ -30,6 +30,10 @@
     - Drop obsolete configure switches.
     - No longer move gnome-power-cmd.sh around, as it has been removed
       upstream.
+  * Drop patches
+    - debian/patches/03-system-policy.patch (merged upstream)
+    - debian/patches/07-bugreport-shebang.patch (merged upstream)
+  * Refresh all patches.
 
  -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Mon, 03 Aug 2009 13:07:17 +0200
 

Modified: desktop/experimental/gnome-power-manager/debian/patches/02_autostart_init.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/patches/02_autostart_init.patch?rev=21783&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/patches/02_autostart_init.patch [utf-8] (original)
+++ desktop/experimental/gnome-power-manager/debian/patches/02_autostart_init.patch [utf-8] Sun Oct  4 21:43:01 2009
@@ -1,7 +1,7 @@
-Index: gnome-power-manager-2.28.0/data/gnome-power-manager.desktop.in.in
+Index: b/data/gnome-power-manager.desktop.in.in
 ===================================================================
---- gnome-power-manager-2.28.0.orig/data/gnome-power-manager.desktop.in.in	2009-10-04 23:26:58.000000000 +0200
-+++ gnome-power-manager-2.28.0/data/gnome-power-manager.desktop.in.in	2009-10-04 23:27:03.000000000 +0200
+--- a/data/gnome-power-manager.desktop.in.in	2009-10-04 23:41:50.000000000 +0200
++++ b/data/gnome-power-manager.desktop.in.in	2009-10-04 23:41:56.000000000 +0200
 @@ -12,5 +12,6 @@
  X-GNOME-Bugzilla-Component=gnome-power-manager
  X-GNOME-Bugzilla-Version=@VERSION@

Modified: 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=21783&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/patches/04_cast-align.patch [utf-8] (original)
+++ desktop/experimental/gnome-power-manager/debian/patches/04_cast-align.patch [utf-8] Sun Oct  4 21:43:01 2009
@@ -1,6 +1,8 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -28,12 +28,11 @@
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac	2009-10-04 23:31:33.000000000 +0200
++++ b/configure.ac	2009-10-04 23:40:49.000000000 +0200
+@@ -32,12 +32,11 @@
  if test "$GCC" = "yes"; then
  	WARNINGFLAGS="$WARNINGFLAGS -Wall"
  	WARNINGFLAGS="$WARNINGFLAGS -Werror"

Modified: desktop/experimental/gnome-power-manager/debian/patches/06-bugreport-debian.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/patches/06-bugreport-debian.patch?rev=21783&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/patches/06-bugreport-debian.patch [utf-8] (original)
+++ desktop/experimental/gnome-power-manager/debian/patches/06-bugreport-debian.patch [utf-8] Sun Oct  4 21:43:01 2009
@@ -1,8 +1,8 @@
-Index: tools/gnome-power-bugreport.sh
+Index: b/tools/gnome-power-bugreport.sh
 ===================================================================
---- a/tools/gnome-power-bugreport.sh	(revision 3137)
-+++ b/tools/gnome-power-bugreport.sh	(working copy)
-@@ -36,7 +36,11 @@
+--- a/tools/gnome-power-bugreport.sh	2009-10-04 23:31:33.000000000 +0200
++++ b/tools/gnome-power-bugreport.sh	2009-10-04 23:41:34.000000000 +0200
+@@ -37,7 +37,11 @@
  }
  
  echo -n "Distro version:       "

Modified: desktop/experimental/gnome-power-manager/debian/patches/08-desktop-bugreport-path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/patches/08-desktop-bugreport-path.patch?rev=21783&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/patches/08-desktop-bugreport-path.patch [utf-8] (original)
+++ desktop/experimental/gnome-power-manager/debian/patches/08-desktop-bugreport-path.patch [utf-8] Sun Oct  4 21:43:01 2009
@@ -1,8 +1,8 @@
-Index: data/gnome-power-preferences.desktop.in.in
+Index: b/data/gnome-power-preferences.desktop.in.in
 ===================================================================
---- a/data/gnome-power-preferences.desktop.in.in	(revision 3137)
-+++ b/data/gnome-power-preferences.desktop.in.in	(working copy)
-@@ -13,4 +13,4 @@
+--- a/data/gnome-power-preferences.desktop.in.in	2009-10-04 23:31:33.000000000 +0200
++++ b/data/gnome-power-preferences.desktop.in.in	2009-10-04 23:41:38.000000000 +0200
+@@ -12,4 +12,4 @@
  X-GNOME-Bugzilla-Product=gnome-power-manager
  X-GNOME-Bugzilla-Component=gnome-power-preferences
  X-GNOME-Bugzilla-Version=@VERSION@

Modified: desktop/experimental/gnome-power-manager/debian/patches/90_autoconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/patches/90_autoconf.patch?rev=21783&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/patches/90_autoconf.patch [utf-8] (original)
+++ desktop/experimental/gnome-power-manager/debian/patches/90_autoconf.patch [utf-8] Sun Oct  4 21:43:01 2009
@@ -1,6 +1,8 @@
---- a/configure
-+++ b/configure
-@@ -12596,12 +12596,11 @@
+Index: b/configure
+===================================================================
+--- a/configure	2009-10-04 23:32:06.000000000 +0200
++++ b/configure	2009-10-04 23:41:44.000000000 +0200
+@@ -11887,12 +11887,11 @@
  if test "$GCC" = "yes"; then
  	WARNINGFLAGS="$WARNINGFLAGS -Wall"
  	WARNINGFLAGS="$WARNINGFLAGS -Werror"

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=21783&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-power-manager/debian/patches/series [utf-8] Sun Oct  4 21:43:01 2009
@@ -1,7 +1,5 @@
 02_autostart_init.patch
-03-system-policy.patch
 04_cast-align.patch
 06-bugreport-debian.patch
-07-bugreport-shebang.patch
 08-desktop-bugreport-path.patch
 90_autoconf.patch




More information about the pkg-gnome-commits mailing list