← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/compiz/jaunty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/018_use_metacity_settings.patch

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2009-02-10 10:39:03 UTC
  • mfrom: (0.101.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090210103903-lbxs9kycjwydh5s8
Tags: 1:0.7.9+git20090211-0ubuntu1
https://launchpad.net/bugs/274407
https://launchpad.net/bugs/327793
* build from the 0.8 git branch
  - fixes focus problem (LP: #274407)
  - fixes problem with latest libmetacity decoration (LP: #327793)
  - enable new gnomecompat plugin by default
* debian/patches:
 - updated 013-add-cursor-theme-support.patch
 - updated 018_use_metacity_settings.patch
 - updated 029_default_options
 - updated 035_ignore_workspaces
 - updated 037_fullscreen_stacking_fixes.patch (mostly merged upstream
   just the move plugin changes remain)
 - dropped 027_default_to_gnome_terminal
 - dropped 040_resolve-animation-fade-conflict_from_upstream.patch
 - dropped 047_no_display_compiz_desktop.patch
 - dropped 048_from_git_fix_placement.patch
 - dropped 050-scale-keybinding-toggle.patch
 - dropped 051-new-kde4-plasma-api.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/018_use_metacity_settings.patch
1
 
Index: ubuntu/gtk/gnome/compiz.desktop.in
 
1
Index: compiz-0.7.9+git20090210/gtk/gnome/compiz.desktop.in
2
2
===================================================================
3
 
--- ubuntu.orig/gtk/gnome/compiz.desktop.in     2007-06-20 13:52:01.000000000 +0200
4
 
+++ ubuntu/gtk/gnome/compiz.desktop.in  2007-06-20 13:52:23.000000000 +0200
5
 
@@ -3,7 +3,7 @@
6
 
 _Name=Compiz
 
3
--- compiz-0.7.9+git20090210.orig/gtk/gnome/compiz.desktop.in   2009-01-29 11:48:36.000000000 +0100
 
4
+++ compiz-0.7.9+git20090210/gtk/gnome/compiz.desktop.in        2009-02-10 10:43:02.000000000 +0100
 
5
@@ -5,7 +5,7 @@
7
6
 Exec=compiz
 
7
 NoDisplay=true
8
8
 # name of loadable control center module
9
9
-X-GNOME-WMSettingsModule=compiz
10
10
+X-GNOME-WMSettingsModule=metacity
11
 
 # name we put on the WM spec check window
12
 
 X-GNOME-WMName=compiz
13
 
 # back compat only 
 
11
 # autostart phase
 
12
 X-GNOME-Autostart-Phase=WindowManager
 
13
 X-GNOME-Provides=windowmanager