[Python-apps-commits] r1368 - in packages/screenlets/trunk/debian (5 files)

[gilir-guest at users.alioth.debian.org]

    Date: Tuesday, May 27, 2008 @ 22:08:31
  Author: gilir-guest
Revision: 1368

Fix #478462 and #458788 with upstream patches

Added:
  packages/screenlets/trunk/debian/patches/04-fix-clock-offset.patch
  packages/screenlets/trunk/debian/patches/05-disable-Numeric-import.patch
Modified:
  packages/screenlets/trunk/debian/changelog
  packages/screenlets/trunk/debian/control
  packages/screenlets/trunk/debian/patches/03-sticky-on-XFCE.patch

Modified: packages/screenlets/trunk/debian/changelog
===================================================================
--- packages/screenlets/trunk/debian/changelog	2008-05-27 20:47:01 UTC (rev 1367)
+++ packages/screenlets/trunk/debian/changelog	2008-05-27 22:08:31 UTC (rev 1368)
@@ -5,8 +5,15 @@
      is not installed.
    - 03-sticky-on-XFCE.patch : Keep sticky mode on restart for XFCE. 
      Thanks Luca Niccoli for the patch (Closes: #480672)
+   - 04-fix-clock-offset.patch : From upstream, update date of Clock 
+     Screenlet at midnight, even if there is an offset. (Closes: 
+     #458788)
+   - 05-disable-Numeric-import.patch : From upstream, disable import 
+     Numeric, not necessary (Closes: #478462)
+  * debian/control
+   - Drop Depends on python-numeric. 
 
- -- Julien Lavergne <julien.lavergne at gmail.com>  Sat, 24 May 2008 17:15:55 +0200
+ -- Julien Lavergne <julien.lavergne at gmail.com>  Wed, 28 May 2008 00:01:13 +0200
 
 screenlets (0.1.1-1) unstable; urgency=low
 

Modified: packages/screenlets/trunk/debian/control
===================================================================
--- packages/screenlets/trunk/debian/control	2008-05-27 20:47:01 UTC (rev 1367)
+++ packages/screenlets/trunk/debian/control	2008-05-27 22:08:31 UTC (rev 1368)
@@ -27,7 +27,6 @@
 Recommends: 	gnome-keyring,
 		python-feedparser,
 		python-gmenu,
-		python-numeric,
 		python-gnome2-extras,
 		iceweasel | firefox
 Suggests: 	metacity (>= 2.21.4) | xcompmgr | compiz | xfwm4 (>= 4.2), 

Modified: packages/screenlets/trunk/debian/patches/03-sticky-on-XFCE.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/03-sticky-on-XFCE.patch	2008-05-27 20:47:01 UTC (rev 1367)
+++ packages/screenlets/trunk/debian/patches/03-sticky-on-XFCE.patch	2008-05-27 22:08:31 UTC (rev 1368)
@@ -1,5 +1,5 @@
 --- /usr/share/pyshared/screenlets/__init__.py	2008-05-07 14:54:09.000000000 +0200
-+++ src/lib/__init__patched.py	2008-05-11 15:53:53.000000000 +0200
++++ src/lib/__init__.py	2008-05-11 15:53:53.000000000 +0200
 @@ -1138,12 +1138,13 @@
  		self.window.present()			
  		

Added: packages/screenlets/trunk/debian/patches/04-fix-clock-offset.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/04-fix-clock-offset.patch	                        (rev 0)
+++ packages/screenlets/trunk/debian/patches/04-fix-clock-offset.patch	2008-05-27 22:08:31 UTC (rev 1368)
@@ -0,0 +1,43 @@
+=== modified file 'src/share/screenlets/Clock/ClockScreenlet.py'
+--- src/share/screenlets/Clock/ClockScreenlet.py	2008-05-16 12:36:59 +0000
++++ src/share/screenlets/Clock/ClockScreenlet.py	2008-05-27 00:36:38 +0000
+@@ -33,7 +33,7 @@
+ import math
+ import cairo
+ import pango
+-from datetime import datetime
++import datetime
+ import gobject
+ import os
+ from os import environ
+@@ -94,7 +94,7 @@
+ 	__timeout		= None
+ 	__buffer_back	= None
+ 	__buffer_fore	= None
+-	__time = datetime.now()
++	__time = datetime.datetime.now()
+ 	__alarm_running	= False
+ 	__alarm_state	= 0
+ 	__alarm_count	= 0
+@@ -212,8 +212,9 @@
+ 	
+ 	def get_date (self):
+ 		"""Only needed for the service."""
+-		self.__time = datetime.now()
+-		return self.__time.strftime(self.date_format)
++		self.__time = datetime.datetime.now()
++		add_offset=datetime.timedelta(hours=self.time_offset)
++		return (self.__time+add_offset).strftime(self.date_format)
+ 
+ 	def get_time (self):
+ 		"""Only needed for the service."""
+@@ -321,7 +322,7 @@
+ 	def update (self):
+ 		"""Update the time and redraw the canvas"""
+ 		environ['TZ'] = self.timezone
+-		self.__time = datetime.now()
++		self.__time = datetime.datetime.now()
+ 		if self.alarm_activated:
+ 			self.check_alarm()
+ 		if self.show_date:
+

Added: packages/screenlets/trunk/debian/patches/05-disable-Numeric-import.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/05-disable-Numeric-import.patch	                        (rev 0)
+++ packages/screenlets/trunk/debian/patches/05-disable-Numeric-import.patch	2008-05-27 22:08:31 UTC (rev 1368)
@@ -0,0 +1,12 @@
+=== modified file 'src/share/screenlets/ClearWeather/ClearWeatherScreenlet.py'
+--- src/share/screenlets/ClearWeather/ClearWeatherScreenlet.py	2008-05-25 13:57:38 +0000
++++ src/share/screenlets/ClearWeather/ClearWeatherScreenlet.py	2008-05-27 00:03:37 +0000
+@@ -13,7 +13,6 @@
+ from urllib import urlopen
+ import screenlets
+ from screenlets.options import StringOption, BoolOption
+-from Numeric import *
+ import pygtk
+ pygtk.require('2.0')
+ import cairo
+