diff -u screenlets-0.0.12/debian/changelog screenlets-0.0.12/debian/changelog
--- screenlets-0.0.12/debian/changelog
+++ screenlets-0.0.12/debian/changelog
@@ -1,3 +1,13 @@
+screenlets (0.0.12-0ubuntu3) hardy; urgency=low
+
+  * debian/patches/12_fix-SIGTERM-handler.patch: don't crash on SIGTERM
+    (LP: #197051)
+  * debian/patches/13_fix-clearcalendar-url-crashes.patch: don't try
+    opening calendars locally just because opening them via urllib2 threw an
+    exception (LP: #201649)
+
+ -- Kjell Braden <fnord@pentabarf.de>  Sat, 29 Mar 2008 22:12:24 +0100
+
 screenlets (0.0.12-0ubuntu2) hardy; urgency=low
 
   * debian/patches/10-problem-on-create-tmpfile.patch (LP: #197712)
only in patch2:
unchanged:
--- screenlets-0.0.12.orig/debian/patches/13_fix-clearcalendar-url-crashes.patch
+++ screenlets-0.0.12/debian/patches/13_fix-clearcalendar-url-crashes.patch
@@ -0,0 +1,22 @@
+diff -Nur -x '*.orig' -x '*~' screenlets-0.0.12/src/share/screenlets/ClearCalendar/iCal.py screenlets-0.0.12.new/src/share/screenlets/ClearCalendar/iCal.py
+--- screenlets-0.0.12/src/share/screenlets/ClearCalendar/iCal.py	2008-02-08 03:46:21.000000000 +0100
++++ screenlets-0.0.12.new/src/share/screenlets/ClearCalendar/iCal.py	2008-03-29 22:09:00.000000000 +0100
+@@ -80,12 +80,15 @@
+ 		Put rutine to fetch and convert a resource into lines and feed it to readEvents()
+ 		'''
+ 		dataLines = None
+-		try:
+-			import urllib2
++		if str(url).lower().startswith('http') or str(url).lower().startswith('www'):
++			try:
++				import urllib2
++			except: print 'Please install urllib2'
+ 			tempFile = urllib2.urlopen(url)
+ 			dataLines = tempFile.readlines()
+ 			tempFile.close()
+-		except:
++		else:
++			
+ 			tempFile = open(url,'r')
+ 			dataLines = tempFile.readlines()
+ 			tempFile.close()
only in patch2:
unchanged:
--- screenlets-0.0.12.orig/debian/patches/12_fix-SIGTERM-handler.patch
+++ screenlets-0.0.12/debian/patches/12_fix-SIGTERM-handler.patch
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' screenlets-0.0.12/src/lib/session.py screenlets-0.0.12.new/src/lib/session.py
+--- screenlets-0.0.12/src/lib/session.py	2008-02-08 03:46:21.000000000 +0100
++++ screenlets-0.0.12.new/src/lib/session.py	2008-03-29 16:07:57.000000000 +0100
+@@ -411,7 +411,7 @@
+ 		instance. Handles sigkill (?) and keyboard interrupts."""
+ 		# add sigkill-handler
+ 		import signal
+-		def on_kill():
++		def on_kill(*args):
+ 			print _("Screenlet has been killed. TODO: make this an event")
+ 		signal.signal(signal.SIGTERM, on_kill)
+ 		# set name of tempfile for later (else its missing after kill)