[maemo-commits] [maemo-commits] r16009 - in projects/haf/trunk/osso-af-startup: . debian services

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-09-04 14:57:18 +0300 (Thu, 04 Sep 2008)
New Revision: 16009

Modified:
   projects/haf/trunk/osso-af-startup/configure.ac
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/services/af-defines.sh
   projects/haf/trunk/osso-af-startup/services/real-af-services
Log:
Removed references to matchbox


Modified: projects/haf/trunk/osso-af-startup/configure.ac
===================================================================
--- projects/haf/trunk/osso-af-startup/configure.ac	2008-09-04 11:55:57 UTC (rev 16008)
+++ projects/haf/trunk/osso-af-startup/configure.ac	2008-09-04 11:57:18 UTC (rev 16009)
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(osso-af-startup, 1.68)
+AM_INIT_AUTOMAKE(osso-af-startup, 1.69)
 
 AC_OUTPUT(Makefile \
 	services/Makefile \

Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2008-09-04 11:55:57 UTC (rev 16008)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2008-09-04 11:57:18 UTC (rev 16009)
@@ -1,6 +1,13 @@
+osso-af-startup (1.69-1) unstable; urgency=low
+
+  * Removed references to matchbox.sh
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Thu,  4 Sep 2008 14:41:19 +0300
+
 osso-af-startup (1.68-1) unstable; urgency=low
 
   * chmod 777 /tmp/af-piddir from af-defines.sh, just like from fb-progress.sh
+  * Fixes: NB#85765
 
  -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Wed, 30 Jul 2008 14:15:05 +0300
 

Modified: projects/haf/trunk/osso-af-startup/services/af-defines.sh
===================================================================
--- projects/haf/trunk/osso-af-startup/services/af-defines.sh	2008-09-04 11:55:57 UTC (rev 16008)
+++ projects/haf/trunk/osso-af-startup/services/af-defines.sh	2008-09-04 11:57:18 UTC (rev 16009)
@@ -116,7 +116,6 @@
   }
 
   source_if_is osso-gtk.defs
-  source_if_is matchbox.defs
   source_if_is keyboard.defs
   source_if_is sdl.defs
 

Modified: projects/haf/trunk/osso-af-startup/services/real-af-services
===================================================================
--- projects/haf/trunk/osso-af-startup/services/real-af-services	2008-09-04 11:55:57 UTC (rev 16008)
+++ projects/haf/trunk/osso-af-startup/services/real-af-services	2008-09-04 11:57:18 UTC (rev 16009)
@@ -43,7 +43,6 @@
   fi
 
   source $AF_INIT_DIR/sapwood-server.sh start
-  source $AF_INIT_DIR/matchbox.sh start
 
   # wait until system D-BUS is ready (some stuff started by init
   # after us assume it is running)
@@ -73,9 +72,6 @@
     source $AF_INIT_DIR/osso-media-server.sh stop
     unset LD_PRELOAD
   fi
-  if [ -f $AF_INIT_DIR/matchbox.sh ]; then
-    source $AF_INIT_DIR/matchbox.sh stop
-  fi
   source $AF_INIT_DIR/sapwood-server.sh stop
 
   if [ -x /etc/init.d/at-spi ]; then