r23190 - in /desktop/unstable/gnome-session/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Mar  5 12:48:30 2010
New Revision: 23190

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23190
Log:
Require upower/libdevkit-power unconditionnally, now that it works 
on kfreebsd. 

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

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=23190&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/changelog [utf-8] Fri Mar  5 12:48:30 2010
@@ -3,8 +3,10 @@
   * 12_no_gdm_fallback.patch: new patch. Don’t fall back on GDM if 
     ConsoleKit failed to reboot. CK will not even be attempted if it is 
     not available, anyway. Closes: #572085.
-
- -- Josselin Mouette <joss at debian.org>  Tue, 02 Mar 2010 09:52:28 +0100
+  * Require upower/libdevkit-power unconditionnally, now that it works 
+    on kfreebsd. 
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 05 Mar 2010 13:45:33 +0100
 
 gnome-session (2.28.0-6) unstable; urgency=low
 

Modified: desktop/unstable/gnome-session/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/control?rev=23190&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/control [utf-8] Fri Mar  5 12:48:30 2010
@@ -18,7 +18,7 @@
                libglib2.0-dev (>= 2.16.0),
                libgtk2.0-dev (>= 2.14.0),
                type-handling,
-               libdevkit-power-gobject-dev (>= 008) | not+linux-gnu,
+               libdevkit-power-gobject-dev (>= 008),
                libdbus-glib-1-dev (>= 0.76),
                libgconf2-dev (>= 2.10.1-6),
                libstartup-notification0-dev,
@@ -97,7 +97,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          dbus-x11,
-         upower [linux-any]
+         upower
 Conflicts: gnome-session (<< 2.26.1-5)
 Description: The GNOME Session Manager - Minimal runtime
  This package contains the binaries for the GNOME Session Manager, but 

Modified: desktop/unstable/gnome-session/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/control.in?rev=23190&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/control.in [utf-8] Fri Mar  5 12:48:30 2010
@@ -13,7 +13,7 @@
                libglib2.0-dev (>= 2.16.0),
                libgtk2.0-dev (>= 2.14.0),
                type-handling,
-               libdevkit-power-gobject-dev (>= 008) | not+linux-gnu,
+               libdevkit-power-gobject-dev (>= 008),
                libdbus-glib-1-dev (>= 0.76),
                libgconf2-dev (>= 2.10.1-6),
                libstartup-notification0-dev,
@@ -92,7 +92,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          dbus-x11,
-         upower [linux-any]
+         upower
 Conflicts: gnome-session (<< 2.26.1-5)
 Description: The GNOME Session Manager - Minimal runtime
  This package contains the binaries for the GNOME Session Manager, but