r11678 - in /desktop/unstable/gdm/debian: changelog control control.in patches/35_gdm.conf.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Jun 25 13:46:41 2007
New Revision: 11678

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11678
Log:
* Move the nested servers to Recommends.
* Suggest hibernate instead of apmd.
* 35_gdm.conf.patch: use hibernate as the default suspend command.

Modified:
    desktop/unstable/gdm/debian/changelog
    desktop/unstable/gdm/debian/control
    desktop/unstable/gdm/debian/control.in
    desktop/unstable/gdm/debian/patches/35_gdm.conf.patch

Modified: desktop/unstable/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/changelog?rev=11678&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog (original)
+++ desktop/unstable/gdm/debian/changelog Mon Jun 25 13:46:41 2007
@@ -11,7 +11,12 @@
   [ Loic Minier ]
   * Fix tabs versus spaces in gdm.install.
 
- -- Loic Minier <lool at dooz.org>  Sun, 10 Jun 2007 17:11:20 +0200
+  [ Josselin Mouette ]
+  * Move the nested servers to Recommends.
+  * Suggest hibernate instead of apmd.
+  * 35_gdm.conf.patch: use hibernate as the default suspend command.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 25 Jun 2007 15:45:38 +0200
 
 gdm (2.18.2-1) unstable; urgency=low
 

Modified: desktop/unstable/gdm/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/control?rev=11678&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/control (original)
+++ desktop/unstable/gdm/debian/control Mon Jun 25 13:46:41 2007
@@ -42,11 +42,10 @@
          librsvg2-common
 Recommends: whiptail | dialog,
             zenity,
-            gdm-themes
+            gdm-themes,
+            xserver-xephyr | xnest
 Suggests: locales,
-          apmd,
-          msttcorefonts,
-          xserver-xephyr | xnest
+          hibernate
 Provides: x-display-manager
 Description: GNOME Display Manager
  gdm provides the equivalent of a "login:" prompt for X displays- it

Modified: desktop/unstable/gdm/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/control.in?rev=11678&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/control.in (original)
+++ desktop/unstable/gdm/debian/control.in Mon Jun 25 13:46:41 2007
@@ -42,11 +42,10 @@
          librsvg2-common
 Recommends: whiptail | dialog,
             zenity,
-            gdm-themes
+            gdm-themes,
+            xserver-xephyr | xnest
 Suggests: locales,
-          apmd,
-          msttcorefonts,
-          xserver-xephyr | xnest
+          hibernate
 Provides: x-display-manager
 Description: GNOME Display Manager
  gdm provides the equivalent of a "login:" prompt for X displays- it

Modified: desktop/unstable/gdm/debian/patches/35_gdm.conf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/35_gdm.conf.patch?rev=11678&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/35_gdm.conf.patch (original)
+++ desktop/unstable/gdm/debian/patches/35_gdm.conf.patch Mon Jun 25 13:46:41 2007
@@ -86,7 +86,7 @@
 -#SuspendCommand=@SUSPEND_COMMAND@
 +RebootCommand=/sbin/shutdown -r now "Rebooted via gdm."
 +HaltCommand=/sbin/shutdown -h now "Shut Down via gdm."
-+SuspendCommand=/usr/bin/apm --suspend
++SuspendCommand=/usr/sbin/hibernate
  # Probably should not touch the below this is the standard setup.
  ServAuthDir=@authdir@
  # This is our standard startup script.  A bit different from a normal X