[maemo-commits] [maemo-commits] r19253 - in projects/haf/trunk/hildon-welcome: . data debian

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2009-08-31 10:19:43 +0300 (Mon, 31 Aug 2009)
New Revision: 19253

Modified:
   projects/haf/trunk/hildon-welcome/configure.ac
   projects/haf/trunk/hildon-welcome/data/10hildon_welcome
   projects/haf/trunk/hildon-welcome/debian/changelog
Log:
Skip hands if /proc/bootreason != pwr_key

Modified: projects/haf/trunk/hildon-welcome/configure.ac
===================================================================
--- projects/haf/trunk/hildon-welcome/configure.ac	2009-08-29 14:54:05 UTC (rev 19252)
+++ projects/haf/trunk/hildon-welcome/configure.ac	2009-08-31 07:19:43 UTC (rev 19253)
@@ -1,5 +1,5 @@
 # Mandatory, inits autoconf
-AC_INIT(hildon-welcome, 0.21)
+AC_INIT(hildon-welcome, 0.23)
 
 # Tests that source dir exists
 AC_CONFIG_SRCDIR([src/main.c])

Modified: projects/haf/trunk/hildon-welcome/data/10hildon_welcome
===================================================================
--- projects/haf/trunk/hildon-welcome/data/10hildon_welcome	2009-08-29 14:54:05 UTC (rev 19252)
+++ projects/haf/trunk/hildon-welcome/data/10hildon_welcome	2009-08-31 07:19:43 UTC (rev 19253)
@@ -21,4 +21,6 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-/usr/bin/hildon-welcome --gst-disable-registry-update &
+if test "x$(cat /proc/bootreason)" = "xpwr_key"; then
+  /usr/bin/hildon-welcome --gst-disable-registry-update &
+fi

Modified: projects/haf/trunk/hildon-welcome/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-welcome/debian/changelog	2009-08-29 14:54:05 UTC (rev 19252)
+++ projects/haf/trunk/hildon-welcome/debian/changelog	2009-08-31 07:19:43 UTC (rev 19253)
@@ -1,3 +1,10 @@
+hildon-welcome (0.23-1) unstable; urgency=low
+
+  * Do not run if /proc/bootreason != pwr_key
+  * Fixes: NB#136111 (Nokia handshake must be skipped after accidental reboot)
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Mon, 31 Aug 2009 10:16:49 +0300
+
 hildon-welcome (0.22-1) unstable; urgency=low
 
   * Touch /tmp/hildon-welcome-is-finished upon exiting