2009-07-16 Ke Wang <[email protected]>
authorwangke
Thu, 16 Jul 2009 09:56:46 +0000
changeset 16040 cf3bc6289ae8
parent 16039 b864495670f5
child 16041 b7a652664558
2009-07-16 Ke Wang <[email protected]> * SUNWhamster.spec: * hamster-01-hotkey.diff: - Bump to 2.27.4 - Updated patch hamster-01-hotkey.diff
ChangeLog
SUNWhamster.spec
patches/hamster-01-hotkey.diff
--- a/ChangeLog	Thu Jul 16 09:36:45 2009 +0000
+++ b/ChangeLog	Thu Jul 16 09:56:46 2009 +0000
@@ -1,3 +1,9 @@
+2009-07-16  Ke Wang <[email protected]>
+	* SUNWhamster.spec:
+	* hamster-01-hotkey.diff:
+		- Bump to 2.27.4
+		- Updated patch hamster-01-hotkey.diff
+
 2009-07-16  Ke Wang <[email protected]>
 	* base-specs/enchant.spec:
 	* patches/enchant-01-define_FILE.diff:
--- a/SUNWhamster.spec	Thu Jul 16 09:36:45 2009 +0000
+++ b/SUNWhamster.spec	Thu Jul 16 09:56:46 2009 +0000
@@ -17,8 +17,8 @@
 Name:                    SUNWhamster
 License:                 GPL v3 
 Summary:		 Time tracking for masses	
-Version:                 2.26.2
-Source:                  http://ftp.gnome.org/pub/GNOME/sources/hamster-applet/2.26/hamster-applet-%{version}.tar.gz
+Version:                 2.27.4
+Source:                  http://ftp.gnome.org/pub/GNOME/sources/hamster-applet/2.27/hamster-applet-%{version}.tar.gz
 #date:2008-11-27 owner:wangke bugster:6776761 type:branding
 Patch1:			 hamster-01-hotkey.diff
 URL:                     http://live.gnome.org/ProjectHamster
@@ -128,6 +128,9 @@
 %{_sysconfdir}/gconf/schemas/hamster-applet.schemas
  
 %changelog
+* Thu Jul 16 2009 - [email protected]
+- Bump to 2.27.4
+- Updated patch hamster-01-hotkey.diff
 * Thu May 21 2009
 - Bump to 2.26.2
 * Fri Apr  3 2009 - [email protected]
--- a/patches/hamster-01-hotkey.diff	Thu Jul 16 09:36:45 2009 +0000
+++ b/patches/hamster-01-hotkey.diff	Thu Jul 16 09:56:46 2009 +0000
@@ -1,5 +1,6 @@
---- hamster-applet-2.24.2/data/hamster-applet.schemas.in.orig	2008-11-27 17:00:10.947221000 +0800
-+++ hamster-applet-2.24.2/data/hamster-applet.schemas.in	2008-11-27 17:00:43.399675000 +0800
+diff -ur hamster-applet-2.27.4/data/hamster-applet.schemas.in hamster-applet-2.27.4-new/data/hamster-applet.schemas.in
+--- hamster-applet-2.27.4/data/hamster-applet.schemas.in	2009-05-09 04:59:05.000000000 +0800
++++ hamster-applet-2.27.4-new/data/hamster-applet.schemas.in	2009-07-16 17:50:21.821925107 +0800
 @@ -5,7 +5,7 @@
              <applyto>/apps/hamster-applet/general/keybinding</applyto>
              <owner>hamster-applet</owner>
@@ -9,14 +10,15 @@
              <locale name="C">
                  <short>Show window</short>
                  <long>Keyboard shortcut for showing the Time Tracker window.</long>
---- hamster-applet-2.24.2/hamster/KeyBinder.py.orig	2008-11-27 17:00:58.924057000 +0800
-+++ hamster-applet-2.24.2/hamster/KeyBinder.py	2008-11-27 17:01:17.322565000 +0800
-@@ -34,7 +34,7 @@
+diff -ur hamster-applet-2.27.4/hamster/KeyBinder.py hamster-applet-2.27.4-new/hamster/KeyBinder.py
+--- hamster-applet-2.27.4/hamster/KeyBinder.py	2009-06-18 05:20:02.000000000 +0800
++++ hamster-applet-2.27.4-new/hamster/KeyBinder.py	2009-07-16 17:48:34.478455786 +0800
+@@ -33,7 +33,7 @@
          self.key_combination = self.config.get_keybinding()
-         if self.key_combination == None:
+         if self.key_combination is None:
              # This is for uninstalled cases, the real default is in the schema
 -            self.key_combination = "<Super>H"
 +            self.key_combination = "<Ctrl><Shift>H"
      
-         dispatcher.add_handler("gconf_keybinding_changed", self.on_keybinding_changed)
+         runtime.dispatcher.add_handler("gconf_keybinding_changed", self.on_keybinding_changed)