[Python-apps-commits] r1391 - in packages/screenlets/trunk/debian (4 files)

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

    Date: Friday, June 6, 2008 @ 15:51:40
  Author: gilir-guest
Revision: 1391

* Fix 2 crashs in 0.1.2 release.
* Minor fixes for upload.

Added:
  packages/screenlets/trunk/debian/patches/02-fix-acpi-crash.patch
  packages/screenlets/trunk/debian/patches/03-fix-wallpaperclock-location.patch
Modified:
  packages/screenlets/trunk/debian/changelog
  packages/screenlets/trunk/debian/rules

Modified: packages/screenlets/trunk/debian/changelog
===================================================================
--- packages/screenlets/trunk/debian/changelog	2008-06-06 07:32:24 UTC (rev 1390)
+++ packages/screenlets/trunk/debian/changelog	2008-06-06 15:51:40 UTC (rev 1391)
@@ -1,22 +1,29 @@
-screenlets (0.1.2-1) UNRELEASED; urgency=low
+screenlets (0.1.2-1) unstable; urgency=low
 
-  * New upstream release
+  * New upstream release.
   * debian/control
    - Add python-imaging as Recommends for WallpaperClockScreenlet Screenlets.
   * debian/patches
-   - 01-scripts-cleanup.patch : Update.
-   - Drop others patches, merged upstream.
+   - 01-scripts-cleanup.patch: Update.
+   - 02-fix-acpi-crash.patch: Add exception in ACPI Screenlets when there is 
+     no battery.
+   - 03-fix-wallpaperclock-location.patch: Test WallpaperClock location before 
+     assignation.
+   - 02_RSS_fix_import.patch: removed, merged upstream.
+   - 03-sticky-on-XFCE.patch: removed, merged upstream.
+   - 04-fix-clock-offset.patch: removed, merged upstream.
+   - 05-disable-Numeric-import.patch: removed, merged upstream.
   * debian/rules
    - Don't remove empty directory, fixed upstream.
    - Install screenlets.1 and screenlets-daemon.1 man pages.
    - Add a get-orig-source to repack the tarball.
+   - Delete empty directory in WallpaperClockScreenlet.
   * debian/copyright
    - Update Authors and Copyright.
   * debian/watch
    - Update to upload bz2 tarball.
   * Add screenlets.1 and screenlets-daemon.1 man pages.
-TODO : 
- - add a get-orig rule
+
  -- Julien Lavergne <julien.lavergne at gmail.com>  Wed, 04 Jun 2008 21:39:02 +0200
 
 screenlets (0.1.1-2) unstable; urgency=low

Added: packages/screenlets/trunk/debian/patches/02-fix-acpi-crash.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/02-fix-acpi-crash.patch	                        (rev 0)
+++ packages/screenlets/trunk/debian/patches/02-fix-acpi-crash.patch	2008-06-06 15:51:40 UTC (rev 1391)
@@ -0,0 +1,18 @@
+diff -ur screenlets.orig/src/share/screenlets/ACPIBattery/ACPIBatteryScreenlet.py screenlets/src/share/screenlets/ACPIBattery/ACPIBatteryScreenlet.py
+--- screenlets.orig/src/share/screenlets/ACPIBattery/ACPIBatteryScreenlet.py	2008-06-05 22:09:02.000000000 +0200
++++ screenlets/src/share/screenlets/ACPIBattery/ACPIBatteryScreenlet.py	2008-06-06 17:24:10.000000000 +0200
+@@ -103,7 +103,11 @@
+ 				self.__dict__['update_interval'] = 1
+ 		elif name == "file_auto":
+ 			if value:
+-				dirs=listdir('/proc/acpi/battery/');
++				try:
++					dirs=listdir('/proc/acpi/battery/');
++				except OSError:
++					dirs=[];
++					pass
+ 				dirs.sort();
+ 				try:
+ 					self.__dict__['file_path']='/proc/acpi/battery/'+dirs[0]+'/'
+Seulement dans screenlets/src/share/screenlets/ACPIBattery: ACPIBatteryScreenlet.py~
+

Added: packages/screenlets/trunk/debian/patches/03-fix-wallpaperclock-location.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/03-fix-wallpaperclock-location.patch	                        (rev 0)
+++ packages/screenlets/trunk/debian/patches/03-fix-wallpaperclock-location.patch	2008-06-06 15:51:40 UTC (rev 1391)
@@ -0,0 +1,19 @@
+diff -ur screenlets.orig/src/share/screenlets/WallpaperClock/WallpaperClockScreenlet.py screenlets/src/share/screenlets/WallpaperClock/WallpaperClockScreenlet.py
+--- screenlets.orig/src/share/screenlets/WallpaperClock/WallpaperClockScreenlet.py	2008-06-05 22:09:02.000000000 +0200
++++ screenlets/src/share/screenlets/WallpaperClock/WallpaperClockScreenlet.py	2008-06-06 17:29:36.000000000 +0200
+@@ -78,12 +78,12 @@
+ 	p_layout = None
+ 	home = getoutput("echo $HOME")
+ 	xfce_workarround = False
+-	wall_sel = os.listdir(os.environ['HOME'] + '/.screenlets/WallpaperClock/' + 'wallpapers')
+-	imagepath = os.environ['HOME'] + '/.screenlets/WallpaperClock/'
+ 	if not os.path.exists(os.environ['HOME'] + '/.screenlets/WallpaperClock'):
+ 		os.system('mkdir ' + os.environ['HOME'] + '/.screenlets/WallpaperClock')
+ 	if not os.path.exists(os.environ['HOME'] + '/.screenlets/WallpaperClock/wallpapers'):
+ 		os.system('mkdir ' + os.environ['HOME'] + '/.screenlets/WallpaperClock/wallpapers')
++	wall_sel = os.listdir(os.environ['HOME'] + '/.screenlets/WallpaperClock/' + 'wallpapers')
++	imagepath = os.environ['HOME'] + '/.screenlets/WallpaperClock/'
+ 	# --------------------------------------------------------------------------
+ 	# constructor and internals
+ 	# --------------------------------------------------------------------------
+Seulement dans screenlets/src/share/screenlets/WallpaperClock: WallpaperClockScreenlet.py~

Modified: packages/screenlets/trunk/debian/rules
===================================================================
--- packages/screenlets/trunk/debian/rules	2008-06-06 07:32:24 UTC (rev 1390)
+++ packages/screenlets/trunk/debian/rules	2008-06-06 15:51:40 UTC (rev 1391)
@@ -20,6 +20,7 @@
 
 install/screenlets::
 	rm debian/tmp/usr/share/screenlets/ClearRss/feedparser.py
+	rmdir debian/tmp/usr/share/screenlets/WallpaperClock/wallpapers
 
 binary-predeb/screenlets::
 	find debian/screenlets/usr/share/screenlets-manager/ -name "*.png" -perm 755 | xargs chmod 644