diff -Nru pybootchartgui-0+r139/debian/changelog pybootchartgui-0+r141/debian/changelog
--- pybootchartgui-0+r139/debian/changelog	2009-12-01 21:47:37.000000000 +0100
+++ pybootchartgui-0+r141/debian/changelog	2010-06-20 10:43:57.000000000 +0200
@@ -1,3 +1,22 @@
+pybootchartgui (0+r141) maverick; urgency=low
+
+  * Update to Subversion HEAD (LP: #596475):
+    - Use find, not index to avoid exeptions on unknow proces states. (LP: #512172)
+    - Use mousewheel to scroll up/down, unless ctrl is pressed in which case
+      mousewheeling is used for zoom. 
+
+  * Add --crop-after option; takes a comma-separated list of processes.
+    The chart is cropped at the end of the first 3s idle period after the
+    first of the named processes is started.  The time displayed on the
+    chart is that of the start of the idle period.
+  * Add --annotate option, permitted multiple times; takes a comma-separated
+    list of processes and draws a dashed red line vertically across the chart
+    at the point the first of the named processes is started.
+  * Add --annotate-file option, writes the times found with --annotate to the
+    given filename with a blank line for any missing annotations.
+
+ -- Jean-Louis Dupond <jean-louis@dupond.be>  Sun, 20 Jun 2010 10:31:57 +0200
+
 pybootchartgui (0+r139-2) lucid; urgency=low
 
   * debian/control: Don't provide bootchart-java, otherwise we can't
diff -Nru pybootchartgui-0+r139/pybootchartgui/draw.py pybootchartgui-0+r141/pybootchartgui/draw.py
--- pybootchartgui-0+r139/pybootchartgui/draw.py	2009-12-01 21:47:38.000000000 +0100
+++ pybootchartgui-0+r141/pybootchartgui/draw.py	2010-06-20 10:33:58.000000000 +0200
@@ -102,7 +102,7 @@
 
 # Convert ps process state to an int
 def get_proc_state(flag):
-	return "RSDTZXW".index(flag) + 1
+	return "RSDTZXW".find(flag) + 1
 	
 
 def draw_text(ctx, text, color, x, y):
diff -Nru pybootchartgui-0+r139/pybootchartgui/gui.py pybootchartgui-0+r141/pybootchartgui/gui.py
--- pybootchartgui-0+r139/pybootchartgui/gui.py	2009-12-01 21:47:38.000000000 +0100
+++ pybootchartgui-0+r141/pybootchartgui/gui.py	2010-06-20 10:35:17.000000000 +0200
@@ -141,13 +141,14 @@
                 return False
 
         def on_area_scroll_event(self, area, event):
-                if event.direction == gtk.gdk.SCROLL_UP:
-                        self.zoom_image(self.zoom_ratio * self.ZOOM_INCREMENT)
-                        return True
-                if event.direction == gtk.gdk.SCROLL_DOWN:
-                        self.zoom_image(self.zoom_ratio / self.ZOOM_INCREMENT)
-                        return True
-                return False
+		if event.state & gtk.gdk.CONTROL_MASK:
+                        if event.direction == gtk.gdk.SCROLL_UP:
+                                self.zoom_image(self.zoom_ratio * self.ZOOM_INCREMENT)
+                                return True
+                        if event.direction == gtk.gdk.SCROLL_DOWN:
+                                self.zoom_image(self.zoom_ratio / self.ZOOM_INCREMENT)
+                                return True
+                        return False
 
         def on_area_motion_notify(self, area, event):
                 state = event.state