diff -Nru /tmp/Q7UGnVtOk6/hwdb-client-0.6.11/debian/changelog /tmp/GLW9VrAE1H/hwdb-client-0.6.11.1/debian/changelog
--- /tmp/Q7UGnVtOk6/hwdb-client-0.6.11/debian/changelog	2007-05-25 09:12:50.000000000 +0100
+++ /tmp/GLW9VrAE1H/hwdb-client-0.6.11.1/debian/changelog	2007-10-24 16:16:07.000000000 +0100
@@ -1,3 +1,12 @@
+hwdb-client (0.6.11.1) gutsy-proposed; urgency=low
+
+  * Fix screen resolution detection (Closes: LP#17595)
+    Add debian/patches/01_fix_resolution_detection.diff
+    Patch based on work from Basilio Kublik <sourcercito@gmail.com> and 
+    Rafael Sachetto <rsachetto@gmail.com>
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 24 Oct 2007 15:56:53 +0100
+
 hwdb-client (0.6.11) gutsy; urgency=low
 
   * Upload feisty-updates fix to gutsy
diff -Nru /tmp/Q7UGnVtOk6/hwdb-client-0.6.11/debian/patches/01_fix_resolution_detection.diff /tmp/GLW9VrAE1H/hwdb-client-0.6.11.1/debian/patches/01_fix_resolution_detection.diff
--- /tmp/Q7UGnVtOk6/hwdb-client-0.6.11/debian/patches/01_fix_resolution_detection.diff	1970-01-01 01:00:00.000000000 +0100
+++ /tmp/GLW9VrAE1H/hwdb-client-0.6.11.1/debian/patches/01_fix_resolution_detection.diff	2007-10-24 16:15:31.000000000 +0100
@@ -0,0 +1,73 @@
+--- hwdb/hwdb-kde	2007-10-24 15:44:05.000000000 +0100
++++ hwdb/hwdb-kde	2007-10-24 16:14:20.000000000 +0100
+@@ -467,7 +467,7 @@
+ 
+     def get_xorgdata(self):
+         ati_brain_damage = []
+-        command = 'xrandr -q'
++        command = 'xrandr -q|grep "*"'
+         for item in os.popen('lsmod|grep fglrx'):
+             ati_brain_damage.append(item)
+         if len(ati_brain_damage):
+@@ -475,12 +475,12 @@
+         else:
+             for line in os.popen(command):
+                 fields = string.splitfields(line, '  ')
+-                if fields[0].startswith('*'):
+-                    freq = fields[4].strip('*')
+-                    if fields[4].strip('*') == '\n':
+-                        freq = "N/A"
+-                    retval = unicode(_("\nDetected settings: "), "UTF-8")+fields[1]+" @ "+freq+" Hz"
+-                    self.devdata.append(fields[1].lstrip()+" @ "+fields[4].strip('*')+" Hz")
++                print str(fields)
++                freq = fields[4].strip('+').strip('*')
++                if freq == '\n' or freq == '':
++                    freq = "N/A"
++                retval = unicode(_("\nDetected settings: "), "UTF-8")+fields[1]+" @ "+freq+" Hz"
++                self.devdata.append(fields[1].lstrip()+" @ "+fields[4].strip('*')+" Hz")
+         return retval
+ 
+     def draw_commentwin(self, set):
+--- hwdb/hwdb-gui	2007-10-24 15:41:32.000000000 +0100
++++ hwdb/hwdb-gui	2007-10-24 16:14:34.000000000 +0100
+@@ -238,23 +238,23 @@
+ 	return route
+ 
+     def get_xorgdata(self):
+-    	ati_brain_damage = []
+-        command = 'xrandr -q'
+-	for item in os.popen('lsmod|grep fglrx'):
+-	    ati_brain_damage.append(item)
+-	if len(ati_brain_damage):
+-	    retval = _("\nDetected settings: impossible with fglrx")
+-	else:
+-        	for line in os.popen(command):
+-        		fields = string.splitfields(line, '  ')
+-        		if fields[0].startswith('*'):
+-        			freq = fields[4].strip('*')
+-        			if fields[4].strip('*') == '\n':
+-        			    freq = "N/A"
+-        			retval = _("\nDetected settings: ")+fields[1]+" @ "+freq+" Hz"
+-        		    	self.devdata.append(fields[1].lstrip()+" @ "+fields[4].strip('*')+" Hz")
+-	return retval
+-	
++        ati_brain_damage = []
++        command = 'xrandr -q|grep "*"'
++        for item in os.popen('lsmod|grep fglrx'):
++            ati_brain_damage.append(item)
++        if len(ati_brain_damage):
++            retval = unicode(_("\nDetected settings: impossible with fglrx"), "UTF-8")
++        else:
++            for line in os.popen(command):
++                fields = string.splitfields(line, '  ')
++                print str(fields)
++                freq = fields[4].strip('+').strip('*')
++                if freq == '\n' or freq == '':
++                    freq = "N/A"
++                retval = unicode(_("\nDetected settings: "), "UTF-8")+fields[1]+" @ "+freq+" Hz"
++                self.devdata.append(fields[1].lstrip()+" @ "+fields[4].strip('*')+" Hz")
++        return retval
++
+     def killani(self, set):
+ 	self.redo.set_sensitive(True)
+     	self.canvasani.destroy()
diff -Nru /tmp/Q7UGnVtOk6/hwdb-client-0.6.11/debian/rules /tmp/GLW9VrAE1H/hwdb-client-0.6.11.1/debian/rules
--- /tmp/Q7UGnVtOk6/hwdb-client-0.6.11/debian/rules	2007-04-25 15:04:41.000000000 +0100
+++ /tmp/GLW9VrAE1H/hwdb-client-0.6.11.1/debian/rules	2007-10-24 15:56:36.000000000 +0100
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 binary-install/hwdb-client-common::
 	dh_pycentral -phwdb-client-common