[maemo-commits] [maemo-commits] r14991 - in projects/haf/trunk/hildon-desktop: . debian

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-12-19 18:44:36 +0200 (Wed, 19 Dec 2007)
New Revision: 14991

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/configure.ac
   projects/haf/trunk/hildon-desktop/debian/changelog
   projects/haf/trunk/hildon-desktop/debian/rules
Log:

2007-12-18  Johan Bilien  <johan.bilien at nokia.com>

	* configure.ac: 2.0.7



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-12-19 15:02:09 UTC (rev 14990)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-12-19 16:44:36 UTC (rev 14991)
@@ -1,3 +1,7 @@
+2007-12-18  Johan Bilien  <johan.bilien at nokia.com>
+
+	* configure.ac: 2.0.7
+
 2007-12-10  Johan Bilien  <johan.bilien at nokia.com>
 
 	* libhildonwm/hd-keys.c: catch X errors around call to

Modified: projects/haf/trunk/hildon-desktop/configure.ac
===================================================================
--- projects/haf/trunk/hildon-desktop/configure.ac	2007-12-19 15:02:09 UTC (rev 14990)
+++ projects/haf/trunk/hildon-desktop/configure.ac	2007-12-19 16:44:36 UTC (rev 14991)
@@ -1,6 +1,6 @@
 AC_INIT(Makefile.am)
 
-AM_INIT_AUTOMAKE(hildon-desktop, 2.0.6)
+AM_INIT_AUTOMAKE(hildon-desktop, 2.0.7)
 
 AM_CONFIG_HEADER(config.h)
 

Modified: projects/haf/trunk/hildon-desktop/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/changelog	2007-12-19 15:02:09 UTC (rev 14990)
+++ projects/haf/trunk/hildon-desktop/debian/changelog	2007-12-19 16:44:36 UTC (rev 14991)
@@ -1,3 +1,13 @@
+hildon-desktop (1:2.0.7-1) sardine; urgency=low
+
+  * debian/rules: call dh_installinit with -r to avoid restarting
+  desktop during seamless software updates.
+
+  * libhildonwm/hd-keys.c: catch X errors around call to
+  XKeycodeToKeysym. Fixes: NB#78409
+
+ -- Johan Bilien <johan.bilien at nokia.com>  Tue, 18 Dec 2007 17:33:17 +0200
+
 hildon-desktop (1:2.0.6-1) sardine; urgency=low
 
   * libhildonwm/hd-keys.c: check if a fn + keycode gives keysym,

Modified: projects/haf/trunk/hildon-desktop/debian/rules
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/rules	2007-12-19 15:02:09 UTC (rev 14990)
+++ projects/haf/trunk/hildon-desktop/debian/rules	2007-12-19 16:44:36 UTC (rev 14991)
@@ -139,7 +139,7 @@
 	dh_strip --dbg-package="hildon-desktop" --dbg-package="libhildondesktop0" --dbg-package="libhildonwm0"
 	dh_compress
 	dh_fixperms
-	dh_installinit -- start 51 2 3 4 . stop 20 0 1 5 6 .
+	dh_installinit -r -- start 51 2 3 4 . stop 20 0 1 5 6 .
 #	dh_perl
 #	dh_python
 	dh_makeshlibs -V