r23490 - in /desktop/unstable/gnome-power-manager/debian: ./ patches/

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Mar 31 12:50:16 2010
New Revision: 23490

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23490
Log:
* debian/patches/04_cast-align.patch
  - Removed, -Werror is no longer enforced by default.
* debian/patches/07-bugreport-upower.patch
  - Removed, merged upstream.
* debian/patches/09-inhibit-consolekit-events-after-resume.patch
  - Removed, merged upstream.
* debian/patches/10-do-not-exit-if-hal-is-not-available.patch
  - Removed, merged upstream.
* debian/patches/11-only-connect-to-hal-if-there-is-no-xrandr-hardware.patch
  - Removed, merged upstream.
* debian/patches/12-DeviceKit-disks-is-now-called-UDisks.patch
  - Removed, merged upstream.
* debian/patches/90_autoconf.patch
  - Removed, obsolete.

Removed:
    desktop/unstable/gnome-power-manager/debian/patches/04_cast-align.patch
    desktop/unstable/gnome-power-manager/debian/patches/07-bugreport-upower.patch
    desktop/unstable/gnome-power-manager/debian/patches/09-inhibit-consolekit-events-after-resume.patch
    desktop/unstable/gnome-power-manager/debian/patches/10-do-not-exit-if-hal-is-not-available.patch
    desktop/unstable/gnome-power-manager/debian/patches/11-only-connect-to-hal-if-there-is-no-xrandr-hardware.patch
    desktop/unstable/gnome-power-manager/debian/patches/12-DeviceKit-disks-is-now-called-UDisks.patch
    desktop/unstable/gnome-power-manager/debian/patches/90_autoconf.patch
Modified:
    desktop/unstable/gnome-power-manager/debian/changelog
    desktop/unstable/gnome-power-manager/debian/patches/06-bugreport-debian.patch
    desktop/unstable/gnome-power-manager/debian/patches/series

Modified: desktop/unstable/gnome-power-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/changelog?rev=23490&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-power-manager/debian/changelog [utf-8] Wed Mar 31 12:50:16 2010
@@ -1,6 +1,20 @@
 gnome-power-manager (2.30.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/patches/04_cast-align.patch
+    - Removed, -Werror is no longer enforced by default.
+  * debian/patches/07-bugreport-upower.patch
+    - Removed, merged upstream.
+  * debian/patches/09-inhibit-consolekit-events-after-resume.patch
+    - Removed, merged upstream.
+  * debian/patches/10-do-not-exit-if-hal-is-not-available.patch
+    - Removed, merged upstream.
+  * debian/patches/11-only-connect-to-hal-if-there-is-no-xrandr-hardware.patch
+    - Removed, merged upstream.
+  * debian/patches/12-DeviceKit-disks-is-now-called-UDisks.patch
+    - Removed, merged upstream.
+  * debian/patches/90_autoconf.patch
+    - Removed, obsolete.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 31 Mar 2010 14:19:19 +0200
 

Modified: desktop/unstable/gnome-power-manager/debian/patches/06-bugreport-debian.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/patches/06-bugreport-debian.patch?rev=23490&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/patches/06-bugreport-debian.patch [utf-8] (original)
+++ desktop/unstable/gnome-power-manager/debian/patches/06-bugreport-debian.patch [utf-8] Wed Mar 31 12:50:16 2010
@@ -8,7 +8,7 @@
  echo -n "Distro version:       "
 -cat /etc/*release | uniq
 +if [ -f /etc/debian_version ] ; then
-+  cat /etc/debian_version 
++  cat /etc/debian_version
 +else
 +  cat /etc/*release | uniq
 +fi

Modified: desktop/unstable/gnome-power-manager/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/patches/series?rev=23490&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-power-manager/debian/patches/series [utf-8] Wed Mar 31 12:50:16 2010
@@ -1,10 +1,3 @@
 02_autostart_init.patch
-04_cast-align.patch
 06-bugreport-debian.patch
-07-bugreport-upower.patch
 08-desktop-bugreport-path.patch
-09-inhibit-consolekit-events-after-resume.patch
-10-do-not-exit-if-hal-is-not-available.patch
-11-only-connect-to-hal-if-there-is-no-xrandr-hardware.patch
-12-DeviceKit-disks-is-now-called-UDisks.patch
-90_autoconf.patch