diff -Nru xserver-xorg-video-psb-0.36.0/debian/changelog xserver-xorg-video-psb-0.36.0/debian/changelog
--- xserver-xorg-video-psb-0.36.0/debian/changelog	2011-02-19 08:19:58.000000000 +0000
+++ xserver-xorg-video-psb-0.36.0/debian/changelog	2011-02-19 10:37:41.000000000 +0000
@@ -1,3 +1,10 @@
+xserver-xorg-video-psb (0.36.0-0ubuntu3~1010um7) maverick; urgency=high
+
+  * Non-maintainer upload.
+  * More cleanup
+
+ -- Luca Forina <luca.forina@gmail.com>  Tue, 19 Feb 2011 15:26:06 +0200
+
 xserver-xorg-video-psb (0.36.0-0ubuntu3~1010um6) maverick; urgency=high
 
   * Non-maintainer upload.
diff -Nru xserver-xorg-video-psb-0.36.0/debian/patches/psb_nodebug.patch xserver-xorg-video-psb-0.36.0/debian/patches/psb_nodebug.patch
--- xserver-xorg-video-psb-0.36.0/debian/patches/psb_nodebug.patch	2011-02-19 08:18:12.000000000 +0000
+++ xserver-xorg-video-psb-0.36.0/debian/patches/psb_nodebug.patch	2011-02-19 10:36:48.000000000 +0000
@@ -12,7 +12,45 @@
  
 diff -r -u xserver-xorg-video-psb-0.36.0-ref//src/psb_sdvo.c xserver-xorg-video-psb-0.36.0/src/psb_sdvo.c
 --- xserver-xorg-video-psb-0.36.0-ref//src/psb_sdvo.c	2010-10-02 12:39:28.000000000 +0200
-+++ xserver-xorg-video-psb-0.36.0/src/psb_sdvo.c	2011-02-18 22:13:28.000000000 +0100
++++ xserver-xorg-video-psb-0.36.0/src/psb_sdvo.c	2011-02-19 10:26:38.000000000 +0100
+@@ -581,20 +581,20 @@
+ 	xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
+ 		   "Mismatch slave addr %x != %x\n", slaveAddr,
+ 		   pSDVO->d.SlaveAddr);
+-	
+-	PSB_DEBUG(0,2, "%s: W: %02X ", SDVO_NAME(pSDVO), cmd);
++    if(0){
++        PSB_DEBUG(0,2, "%s: W: %02X ", SDVO_NAME(pSDVO), cmd);
+ 	for (i = 0; i < args_len; i++)
+ 			LogWrite(1,"%02X ", ((CARD8 *)args)[i]);
+ 	for (; i < 8; i++)
+ 			LogWrite(1,"   ");
+ 
+-    for (i = 0; i < sizeof(sdvo_cmd_names) / sizeof(sdvo_cmd_names[0]); i++) {
+-	if (cmd == sdvo_cmd_names[i].cmd) {
+-	    LogWrite(1, "(i830_%s)\n", sdvo_cmd_names[i].name);
+-	    break;
+-	}
++        for (i = 0; i < sizeof(sdvo_cmd_names) / sizeof(sdvo_cmd_names[0]); i++) {
++    	    if (cmd == sdvo_cmd_names[i].cmd) {
++   	        LogWrite(1, "(i830_%s)\n", sdvo_cmd_names[i].name);
++   	        break;
++    	    }
++        }
+     }
+-
+     /* send the output regs */
+     for (i = 0; i < args_len; i++) {
+ 	i830_sdvo_write_byte(output, SDVO_I2C_ARG_0 - i, ((CARD8 *) args)[i]);
+@@ -629,7 +629,7 @@
+ 	}
+ 
+ 	/* Write the SDVO command logging */
+-	if (1) {
++	if (0) {
+ 	    xf86DrvMsg(intel_output->pI2CBus->scrnIndex, X_INFO,
+ 		       "%s: R: ", SDVO_NAME(pSDVO));
+ 	    for (i = 0; i < response_len; i++)
 @@ -3139,8 +3139,9 @@
      }