[maemo-commits] [maemo-commits] r9864 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . data debian

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-02-14 17:14:48 +0200 (Wed, 14 Feb 2007)
New Revision: 9864

Modified:
   projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
   projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac
   projects/haf/branches/maemo-af-desktop/hildon-desktop/data/Makefile.am
   projects/haf/branches/maemo-af-desktop/hildon-desktop/debian/control
Log:

2007-02-14  Johan Bilien  <johan.bilien at nokia.com>

	* data/hildon-desktop.sh: Added startup script



Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-02-14 15:01:47 UTC (rev 9863)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-02-14 15:14:48 UTC (rev 9864)
@@ -1,5 +1,9 @@
 2007-02-13  Johan Bilien  <johan.bilien at nokia.com>
 
+	* data/hildon-desktop.sh: Added startup script
+
+2007-02-13  Johan Bilien  <johan.bilien at nokia.com>
+
 	* libhildondesktop/hd-wm.c: fixed a compilation warning
 
 2007-02-13  Johan Bilien  <johan.bilien at nokia.com>

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac	2007-02-14 15:01:47 UTC (rev 9863)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac	2007-02-14 15:14:48 UTC (rev 9864)
@@ -1,6 +1,6 @@
 AC_INIT(Makefile.am)
 
-AM_INIT_AUTOMAKE(maemo-af-desktop, 3.9)
+AM_INIT_AUTOMAKE(hildon-desktop, 0.1)
 
 AM_CONFIG_HEADER(config.h)
 
@@ -178,6 +178,9 @@
 hildonpluginloaderlibdir=${hildondesktoplibdir}/loaders
 AC_SUBST(hildonpluginloaderlibdir)
 
+hildondesktopstartupdir=${sysconfdir}/osso-af-init
+AC_SUBST(hildondesktopstartupdir)
+
 #++++++++++++++++++++
 # Background Manager 
 #++++++++++++++++++++

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/data/Makefile.am
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/data/Makefile.am	2007-02-14 15:01:47 UTC (rev 9863)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/data/Makefile.am	2007-02-14 15:14:48 UTC (rev 9864)
@@ -10,4 +10,7 @@
 	app-switcher.desktop       \
         others-button.desktop	
 
+hildondesktopstartup_SCRIPTS = \
+        hildon-desktop.sh
+
 CLEANFILES = *~

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/debian/control
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/debian/control	2007-02-14 15:01:47 UTC (rev 9863)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/debian/control	2007-02-14 15:14:48 UTC (rev 9864)
@@ -9,6 +9,8 @@
 Section: x11
 Architecture: any
 Depends:  ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends}
+Conflicts: maemo-af-desktop
+Replaces: maemo-af-desktop
 Description: Desktop environment for embedded devices
   Hildon Desktop is a desktop environment for embedded devices. It
   is based on the GNOME platform