diff -u kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_23_kde-powermanager_gpmhelper.patch kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_23_kde-powermanager_gpmhelper.patch --- kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_23_kde-powermanager_gpmhelper.patch +++ kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_23_kde-powermanager_gpmhelper.patch @@ -1,7 +1,7 @@ diff -Nur -x '*.orig' -x '*~' kde-guidance-0.8.0svn20080103/powermanager/gpmhelper.py kde-guidance-0.8.0svn20080103.new/powermanager/gpmhelper.py --- kde-guidance-0.8.0svn20080103/powermanager/gpmhelper.py 1970-01-01 01:00:00.000000000 +0100 -+++ kde-guidance-0.8.0svn20080103.new/powermanager/gpmhelper.py 2008-03-25 15:08:51.000000000 +0100 -@@ -0,0 +1,127 @@ ++++ kde-guidance-0.8.0svn20080103.new/powermanager/gpmhelper.py 2008-04-22 09:48:28.000000000 +0200 +@@ -0,0 +1,147 @@ +#!/usr/bin/python +# -*- coding: UTF-8 -*- +""" @@ -47,20 +47,30 @@ + def signal_recv(self, *args): + if args[0] == "ButtonPressed": + if args[1] == "brightness-up": ++ if time.time()-0.02 <= self.last_brightness_up <= time.time(): ++ """Most likely an extra brightness-up call, discarding""" ++ print "Extra brightness-up call discarded" ++ return + try: + ok, foo = self.mother.brightnessUp() + if not ok: + print "brightnessUp-call failed" + return self.mother_alive() ++ self.last_brightness_up = time.time() + except: + print "brightnessUp-call failed" + return self.mother_alive() + elif args[1] == "brightness-down": ++ if time.time()-0.02 <= self.last_brightness_down <= time.time(): ++ """Most likely an extra brightness-down call, discarding""" ++ print "Extra brightness-down call discarded" ++ return + try: + ok, foo = self.mother.brightnessDown() + if not ok: + print "brightnessDown-call failed" + return self.mother_alive() ++ self.last_brightness_down = time.time() + except: + print "brightnessDown-call failed" + return self.mother_alive() @@ -79,11 +89,16 @@ + print "suspend-call failed" + return self.mother_alive() + elif args[1] == "hibernate": ++ if time.time()-1 <= self.last_hibernate <= time.time(): ++ """Most likely an extra hibernate-call, discarding""" ++ print "Extra hibernate-call discarded" ++ return + try: + ok, foo = self.mother.hibernate() + if not ok: + print "hibernate-call failed" + return self.mother_alive() ++ self.last_hibernate = time.time() + except: + print "hibernate failed" + return self.mother_alive() @@ -122,16 +137,21 @@ + print "No guidance-power-manager is running" + sys.exit() + -+ """Some laptops issue double sleep-calls, we need to discard one in that case""" ++ """Some laptops issue double sleep/hibernate-calls, we need to discard one in that case""" + self.last_sleep = 0 ++ self.last_hibernate = 0 ++ ++ """And multiple brightness calls is also possible""" ++ self.last_brightness_up = 0 ++ self.last_brightness_down = 0 + +if __name__ == "__main__": + gpmh = GPMHelper() + loop = gobject.MainLoop() + loop.run() diff -Nur -x '*.orig' -x '*~' kde-guidance-0.8.0svn20080103/powermanager/guidance-power-manager.py kde-guidance-0.8.0svn20080103.new/powermanager/guidance-power-manager.py ---- kde-guidance-0.8.0svn20080103/powermanager/guidance-power-manager.py 2008-03-25 15:07:56.000000000 +0100 -+++ kde-guidance-0.8.0svn20080103.new/powermanager/guidance-power-manager.py 2008-03-25 15:07:57.000000000 +0100 +--- kde-guidance-0.8.0svn20080103/powermanager/guidance-power-manager.py 2008-04-22 09:46:03.000000000 +0200 ++++ kde-guidance-0.8.0svn20080103.new/powermanager/guidance-power-manager.py 2008-04-22 09:46:04.000000000 +0200 @@ -1120,5 +1120,14 @@ mainWindow = PowermanagerApp(None, "main window") doDcop(kapp) @@ -148,8 +168,8 @@ + """Kill helper module / button listener""" + os.system('kill '+str(helperPid)) diff -Nur -x '*.orig' -x '*~' kde-guidance-0.8.0svn20080103/setup.py kde-guidance-0.8.0svn20080103.new/setup.py ---- kde-guidance-0.8.0svn20080103/setup.py 2008-03-21 12:24:40.000000000 +0100 -+++ kde-guidance-0.8.0svn20080103.new/setup.py 2008-03-25 15:07:57.000000000 +0100 +--- kde-guidance-0.8.0svn20080103/setup.py 2008-01-03 14:58:07.000000000 +0100 ++++ kde-guidance-0.8.0svn20080103.new/setup.py 2008-04-22 09:46:04.000000000 +0200 @@ -183,6 +183,7 @@ 'wineconfig/drivedetect.py', 'powermanager/guidance-power-manager.py', diff -u kde-guidance-0.8.0svn20080103/debian/copyright kde-guidance-0.8.0svn20080103/debian/copyright --- kde-guidance-0.8.0svn20080103/debian/copyright +++ kde-guidance-0.8.0svn20080103/debian/copyright @@ -27,7 +27,7 @@ Public License can be found in `/usr/share/common-licenses/GPL'. The documentations provided with kde-guidance is distributed under -the GNU Free Documentation License (FDL). They are considered free with +the GNU Free Documentation License (GFDL). They are considered free with regards to the Debian Free Software Guidelines (DFSG) because they don't contain any unmodifiable parts (invariant sections). The complete text of the GNU Free Documentation License can be found below: diff -u kde-guidance-0.8.0svn20080103/debian/changelog kde-guidance-0.8.0svn20080103/debian/changelog --- kde-guidance-0.8.0svn20080103/debian/changelog +++ kde-guidance-0.8.0svn20080103/debian/changelog @@ -1,3 +1,23 @@ +kde-guidance (0.8.0svn20080103-0ubuntu16.1) hardy-proposed; urgency=low + + [ Anthony Fok ] + * kubuntu_32_displayconfig_update_refresh_rate.patch: + - The refresh rate was not updated for the selected resolution, so + resolution change could fail. (LP: #82279) + * kubuntu_33_displayconfig_add_new_video_cards.patch: + - Added 8086:29b2 for "Intel Q35"; + * debian/copyright: s/FDL/GFDL/; + + [ Andreas Wenning ] + * kubuntu_34_kde-powermanager_no_lid_special_behaviour_disable.patch: + - No need to call power plugged/unplugged in init if no lid is + found; this just make us crash. (LP: #231163) + * Edited kubuntu_23_kde-powermanager_gpmhelper.patch to prevent + multiple brightness- or hibernate-calls happening on certain + machines. Already implemented for sleep-calls. (LP: #207473) + + -- Andreas Wenning Thu, 05 Jun 2008 16:24:38 +0200 + kde-guidance (0.8.0svn20080103-0ubuntu16) hardy; urgency=low * kubuntu_26_kde-powermanager_handle_hal_dbus_restarts.patch: only in patch2: unchanged: --- kde-guidance-0.8.0svn20080103.orig/debian/patches/kubuntu_34_kde-powermanager_no_lid_special_behaviour_disable.patch +++ kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_34_kde-powermanager_no_lid_special_behaviour_disable.patch @@ -0,0 +1,14 @@ +diff -Nur -x '*.orig' -x '*~' kde-guidance-0.8.0svn20080103/powermanager/guidance-power-manager.py kde-guidance-0.8.0svn20080103.new/powermanager/guidance-power-manager.py +--- kde-guidance-0.8.0svn20080103/powermanager/guidance-power-manager.py 2008-06-02 22:19:39.000000000 +0200 ++++ kde-guidance-0.8.0svn20080103.new/powermanager/guidance-power-manager.py 2008-06-02 22:20:21.000000000 +0200 +@@ -134,10 +134,6 @@ + """ Check for lid support and disable widgets if it's not there. """ + if not self.powermanager.hasLid: + self.LaptopLidRadios.setEnabled(False) +- if self.powermanager.onBattery(): +- self.powerHasBeenPlugged() +- else: +- self.powerHasBeenUnplugged() + + def _initCB(self, combo, options, values): + """ Initialize QComboBox with proper values from provided options. """ only in patch2: unchanged: --- kde-guidance-0.8.0svn20080103.orig/debian/patches/kubuntu_33_displayconfig_add_new_video_cards.patch +++ kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_33_displayconfig_add_new_video_cards.patch @@ -0,0 +1,25 @@ +diff -Nur -x '*.orig' -x '*~' kde-guidance-0.8.0svn20080103/displayconfig/ldetect-lst/Cards+ kde-guidance-0.8.0svn20080103.new/displayconfig/ldetect-lst/Cards+ +--- kde-guidance-0.8.0svn20080103/displayconfig/ldetect-lst/Cards+ 2008-01-03 14:58:00.000000000 +0100 ++++ kde-guidance-0.8.0svn20080103.new/displayconfig/ldetect-lst/Cards+ 2008-06-02 22:38:04.000000000 +0200 +@@ -2326,6 +2326,10 @@ + DRIVER i810 + DRI_GLX + ++NAME Intel Q35 ++DRIVER intel ++DRI_GLX ++ + # Alan Cox's new "voodoo" driver for Voodoo Graphics and Voodoo II + #0x121a 0x0001 "Card:Voodoo Graphics" "3Dfx Interactive, Inc.|Voodoo" + NAME Voodoo Graphics +diff -Nur -x '*.orig' -x '*~' kde-guidance-0.8.0svn20080103/displayconfig/ldetect-lst/pcitable kde-guidance-0.8.0svn20080103.new/displayconfig/ldetect-lst/pcitable +--- kde-guidance-0.8.0svn20080103/displayconfig/ldetect-lst/pcitable 2008-01-03 14:58:00.000000000 +0100 ++++ kde-guidance-0.8.0svn20080103.new/displayconfig/ldetect-lst/pcitable 2008-06-02 22:38:47.000000000 +0200 +@@ -7507,6 +7507,7 @@ + 0x8086 0x29a5 "unknown" "Intel Corporation|HECI Controller" + 0x8086 0x29a6 "unknown" "Intel Corporation|PT IDER Controller" + 0x8086 0x29a7 "unknown" "Intel Corporation|KT Controller" ++0x8086 0x29b2 "Card:Intel Q35" "Intel Corporation|82Q35 Express Integrated Graphics Controller" + 0x8086 0x2a00 "unknown" "Intel Corporation|Mobile Memory Controller Hub" + 0x8086 0x2a01 "unknown" "Intel Corporation|Mobile PCI Express Root Port" + 0x8086 0x2a02 "unknown" "Intel Corporation|Mobile Integrated Graphics Controller" only in patch2: unchanged: --- kde-guidance-0.8.0svn20080103.orig/debian/patches/kubuntu_32_displayconfig_update_refresh_rate.patch +++ kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_32_displayconfig_update_refresh_rate.patch @@ -0,0 +1,11 @@ +diff -Nur -x '*.orig' -x '*~' kde-guidance-0.8.0svn20080103/displayconfig/displayconfig.py kde-guidance-0.8.0svn20080103.new/displayconfig/displayconfig.py +--- kde-guidance-0.8.0svn20080103/displayconfig/displayconfig.py 2008-04-01 22:42:29.000000000 +0200 ++++ kde-guidance-0.8.0svn20080103.new/displayconfig/displayconfig.py 2008-05-04 03:31:10.000000000 +0800 +@@ -1271,6 +1305,7 @@ + for rate in self.current_screen.getAvailableRefreshRates(): + self.size_refresh_combo.insertItem(i18n("%1 Hz").arg(rate)) + self.size_refresh_combo.setCurrentItem(self.current_screen.getRefreshRateIndex()) ++ self.current_screen.setRefreshRateIndex(self.size_refresh_combo.currentItem()) + + def slotMonitorFocussed(self,currentMonitor): + if currentMonitor==0: