r22873 - in /desktop/unstable/gnome-power-manager/debian: changelog control control.in

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Jan 27 14:31:51 2010
New Revision: 22873

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22873
Log:
Revert r22707

Modified:
    desktop/unstable/gnome-power-manager/debian/changelog
    desktop/unstable/gnome-power-manager/debian/control
    desktop/unstable/gnome-power-manager/debian/control.in

Modified: desktop/unstable/gnome-power-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/changelog?rev=22873&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-power-manager/debian/changelog [utf-8] Wed Jan 27 14:31:51 2010
@@ -1,9 +1,3 @@
-gnome-power-manager (2.28.2-2) UNRELEASED; urgency=low
-
-  * Conflict with uswsusp. Closes: #554046.
-
- -- Josselin Mouette <joss at debian.org>  Mon, 04 Jan 2010 15:58:45 +0100
-
 gnome-power-manager (2.28.2-1) unstable; urgency=low
 
   * New upstream 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=22873&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-power-manager/debian/control [utf-8] Wed Jan 27 14:31:51 2010
@@ -51,7 +51,6 @@
          consolekit,
          devicekit-power (>= 008)
 Breaks: gnome-session (<< 2.28)
-Conflicts: uswsusp
 Recommends: devicekit-disks (>= 006)
 Suggests: hal
 Description: power management tool for the GNOME desktop

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=22873&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-power-manager/debian/control.in [utf-8] Wed Jan 27 14:31:51 2010
@@ -46,7 +46,6 @@
          consolekit,
          devicekit-power (>= 008)
 Breaks: gnome-session (<< 2.28)
-Conflicts: uswsusp
 Recommends: devicekit-disks (>= 006)
 Suggests: hal
 Description: power management tool for the GNOME desktop