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

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Jun  2 12:45:58 2009
New Revision: 20224

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20224
Log:
* 01_gnome-wm.patch:
  + Don’t set LIBGL_ALWAYS_INDIRECT, compiz does it by itself if 
    needed and it slows things down if it’s not needed.
  + Don’t enable the glib compiz plugin, only the gconf one; the glib 
    plugin makes it lock up on startup. Closes: #531388.

Modified:
    desktop/unstable/gnome-session/debian/changelog
    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=20224&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog (original)
+++ desktop/unstable/gnome-session/debian/changelog Tue Jun  2 12:45:58 2009
@@ -1,3 +1,13 @@
+gnome-session (2.26.1-6) unstable; urgency=low
+
+  * 01_gnome-wm.patch:
+    + Don’t set LIBGL_ALWAYS_INDIRECT, compiz does it by itself if 
+      needed and it slows things down if it’s not needed.
+    + Don’t enable the glib compiz plugin, only the gconf one; the glib 
+      plugin makes it lock up on startup. Closes: #531388.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 02 Jun 2009 14:41:45 +0200
+
 gnome-session (2.26.1-5) unstable; urgency=low
 
   * 01_gnome-wm.patch:

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=20224&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/01_gnome-wm.patch (original)
+++ desktop/unstable/gnome-session/debian/patches/01_gnome-wm.patch Tue Jun  2 12:45:58 2009
@@ -1,7 +1,7 @@
 Index: gnome-session-2.26.1/data/gnome-wm
 ===================================================================
 --- gnome-session-2.26.1.orig/data/gnome-wm	2009-04-14 17:31:45.000000000 +0200
-+++ gnome-session-2.26.1/data/gnome-wm	2009-05-31 17:01:30.481664049 +0200
++++ gnome-session-2.26.1/data/gnome-wm	2009-06-02 14:15:19.127440580 +0200
 @@ -40,54 +40,36 @@ for n in "$@" ; do
    esac
  done
@@ -84,17 +84,18 @@
        OPT1=-i
        OPT2=$SMID
        ;;
-@@ -130,7 +112,8 @@ fi
+@@ -130,9 +112,8 @@ fi
  
  case `basename $WINDOW_MANAGER` in
    compiz)
 -    export LIBGL_ALWAYS_INDIRECT=1
-+    LIBGL_ALWAYS_INDIRECT=1
-+    export LIBGL_ALWAYS_INDIRECT
      gtk-window-decorator &
-     OPT3=glib
+-    OPT3=glib
++    #OPT3=glib
      OPT4=gconf
-@@ -140,6 +123,6 @@ case `basename $WINDOW_MANAGER` in
+     ;;
+   beryl)
+@@ -140,6 +121,6 @@ case `basename $WINDOW_MANAGER` in
      ;;
  esac
  
@@ -104,8 +105,8 @@
  echo "ERROR: No window manager could run!"
 Index: gnome-session-2.26.1/data/Makefile.am
 ===================================================================
---- gnome-session-2.26.1.orig/data/Makefile.am	2009-05-31 16:25:48.761665913 +0200
-+++ gnome-session-2.26.1/data/Makefile.am	2009-05-31 16:26:02.731571368 +0200
+--- gnome-session-2.26.1.orig/data/Makefile.am	2009-04-14 17:31:45.000000000 +0200
++++ gnome-session-2.26.1/data/Makefile.am	2009-06-02 14:14:47.090019160 +0200
 @@ -25,7 +25,7 @@ schemas_DATA = $(schemas_in_files:.schem
  bin_SCRIPTS = gnome-wm