X Strike Force X.Org X11 SVN commit: r3595 - in trunk/app/compiz/debian: . patches
Author: beatle
Date: 2006-10-02 12:32:36 -0400 (Mon, 02 Oct 2006)
New Revision: 3595
Modified:
trunk/app/compiz/debian/changelog
trunk/app/compiz/debian/patches/010_snap-by-default.patch
trunk/app/compiz/debian/patches/series
trunk/app/compiz/debian/rules
Log:
Update 010_snap-by-default.patch to include the corresponding schema diff.
Enable building the gconf-dump plugin.
Modified: trunk/app/compiz/debian/changelog
===================================================================
--- trunk/app/compiz/debian/changelog 2006-10-02 02:06:20 UTC (rev 3594)
+++ trunk/app/compiz/debian/changelog 2006-10-02 16:32:36 UTC (rev 3595)
@@ -5,12 +5,15 @@
* Clean up build-dependencies:
+ Remove unnecessarily versioned build-dependencies.
+ Tighten the build-dependency on libxcomposite-dev to (>= 1:0.3-2).
- Closes: 390254.
+ Closes: 390304, 390416.
* Add a manpage documenting the compiz wrapper.
* Check if the gconf plugin is installed before trying to load it in the
wrapper.
+ * Enable building the gconf-dump plugin.
+ * Update 010_snap-by-default patch to also include the corresponding schema
+ diff.
- -- Thierry Reding <thierry@gilfi.de> Sat, 30 Sep 2006 14:56:37 +0200
+ -- Thierry Reding <thierry@gilfi.de> Mon, 2 Oct 2006 07:06:13 +0200
compiz (0.0.13+git20060928-2) unstable; urgency=low
Modified: trunk/app/compiz/debian/patches/010_snap-by-default.patch
===================================================================
--- trunk/app/compiz/debian/patches/010_snap-by-default.patch 2006-10-02 02:06:20 UTC (rev 3594)
+++ trunk/app/compiz/debian/patches/010_snap-by-default.patch 2006-10-02 16:32:36 UTC (rev 3595)
@@ -1,8 +1,8 @@
-diff --git a/plugins/wobbly.c b/plugins/wobbly.c
-index c4df9ba..6c189b8 100644
---- a/plugins/wobbly.c
-+++ b/plugins/wobbly.c
-@@ -177,7 +177,8 @@ static int displayPrivateIndex;
+Index: plugins/wobbly.c
+===================================================================
+--- plugins/wobbly.c (revision 3581)
++++ plugins/wobbly.c (working copy)
+@@ -177,7 +177,8 @@
#define WOBBLY_DISPLAY_OPTION_SNAP 0
#define WOBBLY_DISPLAY_OPTION_SHIVER 1
@@ -12,7 +12,7 @@
typedef struct _WobblyDisplay {
int screenPrivateIndex;
-@@ -2334,6 +2335,7 @@ wobblyHandleEvent (CompDisplay *d,
+@@ -2334,6 +2335,7 @@
XkbStateNotifyEvent *stateEvent = (XkbStateNotifyEvent *) event;
CompAction *action;
unsigned int mods = 0xffffffff;
@@ -20,7 +20,7 @@
action = &wd->opt[WOBBLY_DISPLAY_OPTION_SNAP].value.action;
-@@ -2341,9 +2343,15 @@ wobblyHandleEvent (CompDisplay *d,
+@@ -2341,9 +2343,15 @@
mods = action->key.modifiers;
if ((stateEvent->mods & mods) == mods)
@@ -38,7 +38,7 @@
}
}
break;
-@@ -2854,6 +2862,9 @@ wobblySetDisplayOption (CompDisplay
+@@ -2855,6 +2863,9 @@
if (setDisplayAction (display, o, value))
return TRUE;
break;
@@ -48,7 +48,7 @@
default:
break;
}
-@@ -2893,6 +2904,13 @@ wobblyDisplayInitOptions (WobblyDisplay
+@@ -2894,6 +2905,13 @@
o->value.action.state |= CompActionStateInitKey;
o->value.action.state |= CompActionStateInitButton;
o->value.action.type = 0;
@@ -62,3 +62,26 @@
}
static Bool
+Index: plugins/compiz.schemas.in
+===================================================================
+--- plugins/compiz.schemas.in (revision 3581)
++++ plugins/compiz.schemas.in (working copy)
+@@ -22738,6 +22738,18 @@
+ </schema>
+
+ <schema>
++ <key>/schemas/apps/compiz/plugins/wobbly/allscreens/options/snap_enable</key>
++ <applyto>/apps/compiz/plugins/wobbly/allscreens/options/snap_enable</applyto>
++ <owner>compiz</owner>
++ <type>bool</type>
++ <default>true</default>
++ <locale name="C">
++ <short>Snap Enable</short>
++ <long>Default window snapping mode.</long>
++ </locale>
++ </schema>
++
++ <schema>
+ <key>/schemas/apps/compiz/plugins/wobbly/screen0/options/friction</key>
+ <applyto>/apps/compiz/plugins/wobbly/screen0/options/friction</applyto>
+ <owner>compiz</owner>
Modified: trunk/app/compiz/debian/patches/series
===================================================================
--- trunk/app/compiz/debian/patches/series 2006-10-02 02:06:20 UTC (rev 3594)
+++ trunk/app/compiz/debian/patches/series 2006-10-02 16:32:36 UTC (rev 3595)
@@ -1,5 +1,5 @@
002_tfp-server-extension.patch
005_glfinish.patch
-010_snap-by-default.patch
+010_snap-by-default.patch -p0
011_plane-plugin-schema.patch
012_freedesktop-schema.patch -p0
Modified: trunk/app/compiz/debian/rules
===================================================================
--- trunk/app/compiz/debian/rules 2006-10-02 02:06:20 UTC (rev 3594)
+++ trunk/app/compiz/debian/rules 2006-10-02 16:32:36 UTC (rev 3595)
@@ -38,6 +38,7 @@
confflags += --disable-static \
--enable-librsvg \
+ --enable-gconf-dump \
--disable-kde
build: patch build-stamp
Reply to: