David Barth has proposed merging lp:~dbarth/compiz/oneiric-0.9.5.92-changes into lp:compiz.
Requested reviews: compiz packagers (compiz) For more details, see: https://code.launchpad.net/~dbarth/compiz/oneiric-0.9.5.92-changes/+merge/72550 Prepare for the new upstream version -- https://code.launchpad.net/~dbarth/compiz/oneiric-0.9.5.92-changes/+merge/72550 Your team compiz packagers is requested to review the proposed merge of lp:~dbarth/compiz/oneiric-0.9.5.92-changes into lp:compiz.
=== modified file 'debian/changelog' --- debian/changelog 2011-08-12 07:34:46 +0000 +++ debian/changelog 2011-08-23 11:17:23 +0000 @@ -1,3 +1,25 @@ +compiz (1:0.9.5.92+bzr01-0ubuntu1) oneiric; urgency=low + + * debian/compiz-core.install: remove references to: + -debian/tmp/usr/bin/simple-decorator + -debian/tmp/usr/bin/decoration_inspector + -debian/tmp/usr/share/simple-decorator/simple-decoration.png + -debian/tmp/usr/share/decoration_inspector/decoration_inspector.xml + * debian/libdecoration0.symbols: revert changes to before the decorator + rewrite + * debian/patches/100_core-fix-rev-2794.patch: core fix to avoid decoration + problems + * renamed the upstream tarball to reflect bzr origin + * new test build + + -- David Barth <david.ba...@canonical.com> Tue, 23 Aug 2011 12:19:03 +0200 + +compiz (1:0.9.5.92) oneiric; urgency=low + + * New upstream release (0.9.5.92) + + -- David Barth <david.ba...@canonical.com> Mon, 22 Aug 2011 14:16:01 +0200 + compiz (1:0.9.5.90-0ubuntu1) UNRELEASED; urgency=low [ David Barth ] === modified file 'debian/compiz-core.install' --- debian/compiz-core.install 2011-08-12 07:07:23 +0000 +++ debian/compiz-core.install 2011-08-23 11:17:23 +0000 @@ -1,9 +1,5 @@ debian/tmp/usr/bin/compiz* debian/compiz-decorator usr/bin/ -debian/tmp/usr/bin/simple-decorator -debian/tmp/usr/bin/decoration_inspector -debian/tmp/usr/share/simple-decorator/simple-decoration.png -debian/tmp/usr/share/decoration_inspector/decoration_inspector.xml debian/tmp/usr/share/compiz/cube/images/*.png debian/tmp/usr/share/compiz/*.png debian/tmp/usr/share/compiz/core.xml === modified file 'debian/libdecoration0.symbols' --- debian/libdecoration0.symbols 2011-08-12 07:07:23 +0000 +++ debian/libdecoration0.symbols 2011-08-23 11:17:23 +0000 @@ -1,28 +1,22 @@ libdecoration.so.0 libdecoration0 #MINVER# decor_acquire_dm_session@Base 1:0.9.2.1 -#MISSING: 1:0.9.5.90-0ubuntu4# decor_alloc_property@Base 1:0.9.5.0 +#MISSING: 1:0.9.5.92-0ubuntu1# decor_alloc_property@Base 1:0.9.5.0 decor_apply_gravity@Base 1:0.9.2.1 decor_blend_border_picture@Base 1:0.9.2.1 - decor_cache_append_pixmap@Base 1:0.9.5.90 - decor_cache_append_window@Base 1:0.9.5.90 - decor_cache_destroy@Base 1:0.9.5.90 - decor_cache_new@Base 1:0.9.5.90 - decor_cache_remove_subproperty@Base 1:0.9.5.90 decor_draw_simple@Base 1:0.9.2.1 decor_fill_picture_extents_with_shadow@Base 1:0.9.2.1 -#MISSING: 1:0.9.5.90-0ubuntu3# decor_gen_window_property@Base 1:0.9.2.1 + decor_gen_window_property@Base 1:0.9.2.1 decor_get_best_layout@Base 1:0.9.2.1 decor_get_default_layout@Base 1:0.9.2.1 - decor_get_next_subproperty@Base 1:0.9.5.90 - decor_handle_selection_clear@Base 1:0.9.2.1 decor_handle_selection_request@Base 1:0.9.2.1 decor_pixmap_property_to_quads@Base 1:0.9.2.1 - decor_property_get_num@Base 1:0.9.5.0 -#MISSING: 1:0.9.5.90-0ubuntu3# decor_property_get_type@Base 1:0.9.2.1 +#MISSING: 1:0.9.5.92-0ubuntu1# decor_property_get_num@Base 1:0.9.5.0 + decor_property_get_type@Base 1:0.9.2.1 decor_property_get_version@Base 1:0.9.2.1 -#MISSING: 1:0.9.5.90-0ubuntu3# decor_quads_to_property@Base 1:0.9.2.1 + decor_quads_to_property@Base 1:0.9.2.1 decor_region_to_blur_property@Base 1:0.9.2.1 + decor_request_embed_window@Base 1:0.9.5.92-0ubuntu1 decor_set_dm_check_hint@Base 1:0.9.2.1 decor_set_horz_quad_line@Base 1:0.9.2.1 decor_set_lSrS_window_quads@Base 1:0.9.2.1 @@ -34,9 +28,5 @@ decor_shadow_create@Base 1:0.9.2.1 decor_shadow_destroy@Base 1:0.9.2.1 decor_shadow_reference@Base 1:0.9.2.1 - decor_subproperty_get_size@Base 1:0.9.5.90 - decor_subproperty_get_type@Base 1:0.9.5.90 - decor_subproperty_set_pixmap@Base 1:0.9.5.90 - decor_subproperty_set_window@Base 1:0.9.5.90 decor_version@Base 1:0.9.2.1 decor_window_property@Base 1:0.9.2.1 === added file 'debian/patches/100_core-fix-rev-2794.patch' --- debian/patches/100_core-fix-rev-2794.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/100_core-fix-rev-2794.patch 2011-08-23 11:17:23 +0000 @@ -0,0 +1,125 @@ +=== modified file 'src/privatewindow.h' +--- compiz-0.9.5.92.orig/src/privatewindow.h 2011-08-19 12:58:20 +0000 ++++ compiz-0.9.5.92/src/privatewindow.h 2011-08-23 06:01:56 +0000 +@@ -36,14 +36,10 @@ + + #define WINDOW_INVISIBLE(w) \ + ((w)->attrib.map_state != IsViewable || \ +- (w)->geometry.x () + (w)->geometry.width () + \ +- (w)->geometry.border () * 2 + (w)->output.right <= 0 || \ +- (w)->geometry.y () + (w)->geometry.height () + \ +- (w)->geometry.border () * 2 + (w)->output.bottom <= 0 || \ +- (w)->geometry.x () - \ +- (w)->output.left >= (int) screen->width () || \ +- (w)->geometry.y () - \ +- (w)->output.top >= (int) screen->height () ) ++ (w)->attrib.x + (w)->width + (w)->output.right <= 0 || \ ++ (w)->attrib.y + (w)->height + (w)->output.bottom <= 0 || \ ++ (w)->attrib.x - (w)->output.left >= (int) screen->width () || \ ++ (w)->attrib.y - (w)->output.top >= (int) screen->height () ) + + typedef CompWindowExtents CompFullscreenMonitorSet; + + +=== modified file 'src/screen.cpp' +--- compiz-0.9.5.92.orig/src/screen.cpp 2011-08-20 04:17:41 +0000 ++++ compiz-0.9.5.92/src/screen.cpp 2011-08-23 06:01:56 +0000 +@@ -2036,9 +2036,9 @@ + priv->attrib.height = ce->height; + } + +- priv->reshape (ce->width, ce->height); ++ priv->reshape (ce->width, ce->height); + +- priv->detectOutputDevices (); ++ priv->detectOutputDevices (); + } + + void + +=== modified file 'src/window.cpp' +--- compiz-0.9.5.92.orig/src/window.cpp 2011-08-19 12:58:20 +0000 ++++ compiz-0.9.5.92/src/window.cpp 2011-08-23 06:01:56 +0000 +@@ -796,11 +796,11 @@ + xev.event = screen->root (); + xev.window = priv->frame; + +- xev.x = serverGeometry.x (); +- xev.y = serverGeometry.y (); +- xev.width = serverGeometry.width (); +- xev.height = serverGeometry.height (); +- xev.border_width = serverGeometry.border (); ++ xev.x = x; ++ xev.y = y; ++ xev.width = width; ++ xev.height = height; ++ xev.border_width = window->priv->attrib.border_width; + + xev.above = (window->prev) ? ROOTPARENT (window->prev) : None; + xev.override_redirect = window->priv->attrib.override_redirect; +@@ -955,7 +955,6 @@ + + } + +- /* FIXME: That doesn't look right */ + r.x = -priv->attrib.border_width; + r.y = -priv->attrib.border_width; + r.width = priv->width + priv->attrib.border_width; +@@ -1230,10 +1229,10 @@ + xev.window = priv->id; + + /* normally we should never send configure notify events to override +- * redirect windows but if they support the _NET_WM_SYNC_REQUEST +- * protocol we need to do this when the window is mapped. however the +- * only way we can make sure that the attributes we send are correct +- * and is to grab the server. */ ++ redirect windows but if they support the _NET_WM_SYNC_REQUEST ++ protocol we need to do this when the window is mapped. however the ++ only way we can make sure that the attributes we send are correct ++ and is to grab the server. */ + if (priv->attrib.override_redirect) + { + XWindowAttributes attrib; +@@ -1398,9 +1397,9 @@ + priv->invisible = true; + + if (priv->shaded && priv->height) +- resize (priv->geometry.x (), priv->geometry.y (), +- priv->geometry.width (), priv->geometry.height () - 1, +- priv->geometry.border ()); ++ resize (priv->attrib.x, priv->attrib.y, ++ priv->attrib.width, ++priv->attrib.height - 1, ++ priv->attrib.border_width); + + screen->priv->updateClientList (); + +@@ -1713,6 +1712,10 @@ + { + if (dx || dy) + { ++ /* ++ priv->attrib.x += dx; ++ priv->attrib.y += dy; ++ */ + priv->geometry.setX (priv->geometry.x () + dx); + priv->geometry.setY (priv->geometry.y () + dy); + +@@ -4522,7 +4525,7 @@ + } + else + { +- m = priv->geometry.y () + offY; ++ m = priv->attrib.y + offY; + if (m - priv->input.top < (int) s->height () - vHeight) + rv.setY (offY + vHeight); + else if (m + priv->height + priv->input.bottom > vHeight) +@@ -5347,7 +5350,7 @@ + + if (priv->attrib.c_class != InputOnly) + { +- priv->region = CompRegion (priv->geometry.x (), priv->geometry.y (), ++ priv->region = CompRegion (priv->attrib.x, priv->attrib.y, + priv->width, priv->height); + priv->inputRegion = priv->region; + + === modified file 'debian/patches/series' --- debian/patches/series 2011-08-12 07:07:23 +0000 +++ debian/patches/series 2011-08-23 11:17:23 +0000 @@ -1,2 +1,3 @@ 01_don_t_init_a11y.patch 091_no_use_gnome_but_desktop_file.patch +100_core-fix-rev-2794.patch
_______________________________________________ Mailing list: https://launchpad.net/~compiz Post to : compiz@lists.launchpad.net Unsubscribe : https://launchpad.net/~compiz More help : https://help.launchpad.net/ListHelp