compiz team mailing list archive

[David Barth <david.barth@xxxxxxxxxxxxx>]

David Barth has proposed merging lp:~dbarth/compiz/remove-printf-patch into lp:compiz.

Requested reviews:
  compiz packagers (compiz)

For more details, see:
https://code.launchpad.net/~dbarth/compiz/remove-printf-patch/+merge/57350
-- 
https://code.launchpad.net/~dbarth/compiz/remove-printf-patch/+merge/57350
Your team compiz packagers is requested to review the proposed merge of lp:~dbarth/compiz/remove-printf-patch into lp:compiz.

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-11 11:25:16 +0000
+++ debian/changelog	2011-04-12 16:09:30 +0000
@@ -1,3 +1,17 @@
+compiz (1:0.9.4+bzr20110412-0ubuntu4) UNRELEASED natty; urgency=low
+
+  * remove 00_remove_printf.patch: the patch is now integrated in trunk
+
+ -- David Barth <david.barth@xxxxxxxxxxxxx>  Tue, 12 Apr 2011 15:26:45 +0200
+
+compiz (1:0.9.4+bzr20110411-0ubuntu3) UNRELEASED; urgency=low
+
+  * New upstream snapshot, including all 01_bzr* patch
+  * 02_add_debug_spewer_for_apport.patch:
+    - refreshed
+
+ -- Didier Roche <didrocks@xxxxxxxxxx>  Fri, 08 Apr 2011 20:29:02 +0200
+
 compiz (1:0.9.4+bzr20110411-0ubuntu1) natty; urgency=low
 
   * New upstream snapshot, including all 01_bzr* patch:

=== removed file 'debian/patches/00_remove_printf.patch'
--- debian/patches/00_remove_printf.patch	2011-04-11 11:22:25 +0000
+++ debian/patches/00_remove_printf.patch	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-Index: compiz-0.9.4+bzr20110411/src/event.cpp
-===================================================================
---- compiz-0.9.4+bzr20110411.orig/src/event.cpp	2011-04-11 13:20:13.147881497 +0200
-+++ compiz-0.9.4+bzr20110411/src/event.cpp	2011-04-11 13:20:50.696067682 +0200
-@@ -1179,8 +1179,6 @@
- 	    if (!XGetWindowAttributes (priv->dpy, event->xcreatewindow.window, &wa))
- 		priv->setDefaultWindowAttributes (&wa);
- 
--	    fprintf (stderr, "Window 0x%x created on ReparentNotify, map state isViewable? %i\n", event->xreparent.window,  wa.map_state == IsViewable);
--
- 	    CoreWindow *cw = new CoreWindow (event->xcreatewindow.window);
- 	    cw->manage (priv->getTopWindow (), wa);
- 
-Index: compiz-0.9.4+bzr20110411/src/screen.cpp
-===================================================================
---- compiz-0.9.4+bzr20110411.orig/src/screen.cpp	2011-04-11 13:20:25.683943655 +0200
-+++ compiz-0.9.4+bzr20110411/src/screen.cpp	2011-04-11 13:20:42.284025978 +0200
-@@ -4695,8 +4695,6 @@
- 	if (!XGetWindowAttributes (screen->dpy (), children[i], &attrib))
- 	    priv->setDefaultWindowAttributes (&attrib);
- 
--        fprintf (stderr, "Window created on XQueryTree, map state isViewable? %i\n", attrib.map_state == IsViewable);
--
- 	CoreWindow *cw = new CoreWindow (children[i]);
- 	cw->manage (i ? children[i - 1] : 0, attrib);
- 

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-04-11 11:22:25 +0000
+++ debian/patches/series	2011-04-12 16:09:30 +0000
@@ -1,4 +1,3 @@
-00_remove_printf.patch
 02_add_debug_spewer_for_apport.patch
 018_use_metacity_settings.patch
 029_default_options.patch