r22355 - in /desktop/unstable/gnome-session/debian: changelog control control.in patches/01_gnome-wm.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Nov 16 14:21:11 2009
New Revision: 22355

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22355
Log:
* 01_gnome-wm.patch: OK, you win. Kill all the 3D crap, always use 
  metacity by default. Closes: #553417.
* Drop mesa-utils dependency accordingly.

Modified:
    desktop/unstable/gnome-session/debian/changelog
    desktop/unstable/gnome-session/debian/control
    desktop/unstable/gnome-session/debian/control.in
    desktop/unstable/gnome-session/debian/patches/01_gnome-wm.patch

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=22355&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/changelog [utf-8] Mon Nov 16 14:21:11 2009
@@ -1,3 +1,11 @@
+gnome-session (2.28.0-4) unstable; urgency=low
+
+  * 01_gnome-wm.patch: OK, you win. Kill all the 3D crap, always use 
+    metacity by default. Closes: #553417.
+  * Drop mesa-utils dependency accordingly.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 16 Nov 2009 15:21:05 +0100
+
 gnome-session (2.28.0-3) unstable; urgency=low
 
   * 03_devicekit_optional.patch: new patch. Make DeviceKit-Power support 

Modified: desktop/unstable/gnome-session/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/control?rev=22355&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/control [utf-8] Mon Nov 16 14:21:11 2009
@@ -36,7 +36,6 @@
          metacity | mutter | sawfish,
          nautilus (>= 2.26),
          policykit-1-gnome,
-         mesa-utils,
          gnome-session-bin (>= ${gnome:Version}),
          gnome-session-bin (<< ${gnome:NextVersion})
 Recommends: gnome-power-manager (>= 2.28)

Modified: desktop/unstable/gnome-session/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/control.in?rev=22355&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/control.in [utf-8] Mon Nov 16 14:21:11 2009
@@ -36,7 +36,6 @@
          metacity | mutter | sawfish,
          nautilus (>= 2.26),
          policykit-1-gnome,
-         mesa-utils,
          gnome-session-bin (>= ${gnome:Version}),
          gnome-session-bin (<< ${gnome:NextVersion})
 Recommends: gnome-power-manager (>= 2.28)

Modified: desktop/unstable/gnome-session/debian/patches/01_gnome-wm.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/01_gnome-wm.patch?rev=22355&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/01_gnome-wm.patch [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/patches/01_gnome-wm.patch [utf-8] Mon Nov 16 14:21:11 2009
@@ -1,7 +1,7 @@
 Index: gnome-session-2.28.0/data/gnome-wm
 ===================================================================
 --- gnome-session-2.28.0.orig/data/gnome-wm	2009-07-29 02:36:07.000000000 +0200
-+++ gnome-session-2.28.0/data/gnome-wm	2009-10-24 11:13:13.853760684 +0200
++++ gnome-session-2.28.0/data/gnome-wm	2009-11-16 15:19:11.298109473 +0100
 @@ -40,11 +40,6 @@ for n in "$@" ; do
    esac
  done
@@ -14,7 +14,7 @@
  # Migrate compiz to compiz-manager if possible and needed
  if [ "x$WINDOW_MANAGER" = "xcompiz" -o "x$DEFWM" = "xcompiz" ]; then
    which compiz-manager > /dev/null 2>&1
-@@ -68,41 +63,25 @@ if [ -z "$WINDOW_MANAGER" ] ; then
+@@ -68,41 +63,21 @@ if [ -z "$WINDOW_MANAGER" ] ; then
    # Create a list of window manager we can handle, trying to only use the
    # compositing ones when it makes sense
  
@@ -24,17 +24,14 @@
 -  KNOWN_WM="sawfish sawmill enlightenment icewm wmaker fvwm2 qvwm fvwm twm kwm"
 -  if [ $IS_X_COMPOSITED -eq 0 ] ; then
 -    KNOWN_WM="mutter compiz-manager compiz beryl $KNOWN_WM"
-+  KNOWN_WM="metacity sawfish"
-+  if ! glxinfo | egrep -qi '(direct.*no|renderer.*software)'; then
-+    # 3D acceleration is here, use mutter if available
-+    KNOWN_WM="mutter $KNOWN_WM"
-   fi
+-  fi
 -  # metacity is still the default wm in GNOME
 -  KNOWN_WM="metacity $KNOWN_WM"
- 
+-
 -  OLDIFS=$IFS
 -  if [ -z "$DEFWM" -o "x$DEFWM" = "xgnome-wm" ]; then
--
++  KNOWN_WM="metacity mutter sawfish"
+ 
 -    for wm in $KNOWN_WM ; do
 -      IFS=":"
 -      for dir in $PATH ; do
@@ -68,7 +65,7 @@
  fi
  
  # Now create options OPT1, OPT2 and OPT3 based on the windowmanager used
-@@ -127,7 +106,7 @@ if [ ! -z "$SMID" ] ; then
+@@ -127,7 +102,7 @@ if [ ! -z "$SMID" ] ; then
        OPT1=-s
        OPT2=$SMID
        ;;
@@ -77,7 +74,7 @@
        OPT1=-i
        OPT2=$SMID
        ;;
-@@ -145,9 +124,8 @@ fi
+@@ -145,9 +120,8 @@ fi
  
  case `basename $WINDOW_MANAGER` in
    compiz)
@@ -88,7 +85,7 @@
      OPT4=gconf
      ;;
    beryl)
-@@ -155,6 +133,6 @@ case `basename $WINDOW_MANAGER` in
+@@ -155,6 +129,6 @@ case `basename $WINDOW_MANAGER` in
      ;;
  esac