[maemo-commits] [maemo-commits] r13456 - in projects/haf/trunk/hildon-desktop: debian src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-08-29 14:12:31 +0300 (Wed, 29 Aug 2007)
New Revision: 13456

Modified:
   projects/haf/trunk/hildon-desktop/debian/changelog
   projects/haf/trunk/hildon-desktop/debian/control
   projects/haf/trunk/hildon-desktop/debian/hildon-desktop.init
   projects/haf/trunk/hildon-desktop/debian/rules
   projects/haf/trunk/hildon-desktop/src/Makefile.am
Log:

hildon-desktop (1:0.0.33-2) sardine; urgency=low

  * Add build-dep to maemo-launcher-dev
  * Use pkg-config to retrieve maemo-launcher compilation flags.
    Patch courtesy of Leonid Moiseichuk. Fixes: NB#65937

 -- Johan Bilien <johan.bilien at nokia.com>  Wed, 29 Aug 2007 14:10:43 +0300



Modified: projects/haf/trunk/hildon-desktop/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/changelog	2007-08-29 11:08:06 UTC (rev 13455)
+++ projects/haf/trunk/hildon-desktop/debian/changelog	2007-08-29 11:12:31 UTC (rev 13456)
@@ -1,3 +1,11 @@
+hildon-desktop (1:0.0.33-2) sardine; urgency=low
+
+  * Add build-dep to maemo-launcher-dev
+  * Use pkg-config to retrieve maemo-launcher compilation flags.
+    Patch courtesy of Leonid Moiseichuk. Fixes: NB#65937
+
+ -- Johan Bilien <johan.bilien at nokia.com>  Wed, 29 Aug 2007 14:10:43 +0300
+
 hildon-desktop (1:0.0.33-1) sardine; urgency=low
 
   * libhildondesktop/hildon-desktop-panel-expandable.c: set accept_focus

Modified: projects/haf/trunk/hildon-desktop/debian/control
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/control	2007-08-29 11:08:06 UTC (rev 13455)
+++ projects/haf/trunk/hildon-desktop/debian/control	2007-08-29 11:12:31 UTC (rev 13456)
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Johan Bilien <johan.bilien at nokia.com>
-Build-Depends: debhelper (>= 4.0.0), libhildon1-dev | hildon-libs-dev, pkg-config, libosso-dev (>= 0.9.19), libosso-gnomevfs2-dev, osso-af-settings, libhildonfm2-dev | hildon-fm-dev, libhildonhelp-dev | libosso-help-dev, libxtst-dev, libxml2-dev, osso-esd-dev, libxdamage-dev, libxcomposite-dev, libsqlite3-dev, mce-dev, gtk-doc-tools
+Build-Depends: debhelper (>= 4.0.0), libhildon1-dev | hildon-libs-dev, pkg-config, libosso-dev (>= 0.9.19), libosso-gnomevfs2-dev, osso-af-settings, libhildonfm2-dev | hildon-fm-dev, libhildonhelp-dev | libosso-help-dev, libxtst-dev, libxml2-dev, osso-esd-dev, libxdamage-dev, libxcomposite-dev, libsqlite3-dev, mce-dev, gtk-doc-tools, maemo-launcher-dev (>= 0.23-1)
 Standards-Version: 3.6.0
 
 Package: hildon-desktop

Modified: projects/haf/trunk/hildon-desktop/debian/hildon-desktop.init
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/hildon-desktop.init	2007-08-29 11:08:06 UTC (rev 13455)
+++ projects/haf/trunk/hildon-desktop/debian/hildon-desktop.init	2007-08-29 11:12:31 UTC (rev 13456)
@@ -5,7 +5,7 @@
 case "$1" in
 start)
         su - user $SCRIPT start
-	sleep 5
+	sleep 8
         ;;
 
 stop)   su - user $SCRIPT stop

Modified: projects/haf/trunk/hildon-desktop/debian/rules
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/rules	2007-08-29 11:08:06 UTC (rev 13455)
+++ projects/haf/trunk/hildon-desktop/debian/rules	2007-08-29 11:12:31 UTC (rev 13456)
@@ -15,13 +15,11 @@
 
 CFLAGS = -Wall -g
 
-ifneq (,$(findstring maemo-launcher,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(findstring nolauncher,$(DEB_BUILD_OPTIONS)))
    LAUNCHER = yes
-endif
-
-ifeq "$(strip $(LAUNCHER))" "yes"
    LAUNCHER_DEPENDS = -Vlauncher:Depends="maemo-launcher"
-   LAUNCHER_LDFLAGS = -shared
+   LAUNCHER_CFLAGS = $(shell pkg-config --cflags maemo-launcher-app)
+   LAUNCHER_LDFLAGS = $(shell pkg-config --libs maemo-launcher-app)
 endif
 
 # Use soft-float and thumb mode if it enabled.
@@ -63,7 +61,7 @@
 	dh_testdir
 
 # Add here commands to compile the package.
-	$(MAKE) LAUNCHER_LDFLAGS="$(LAUNCHER_LDFLAGS)"
+	$(MAKE) LAUNCHER_CFLAGS="$(LAUNCHER_CFLAGS)" LAUNCHER_LDFLAGS="$(LAUNCHER_LDFLAGS)"
 	touch build-stamp
 
 clean:

Modified: projects/haf/trunk/hildon-desktop/src/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-desktop/src/Makefile.am	2007-08-29 11:08:06 UTC (rev 13455)
+++ projects/haf/trunk/hildon-desktop/src/Makefile.am	2007-08-29 11:12:31 UTC (rev 13456)
@@ -28,6 +28,7 @@
 	$(LIBXML_CFLAGS)                                                   \
 	$(GNOME_VFS_CFLAGS)                                                \
 	$(DBUS_GLIB_CFLAGS)                                                \
+	$(LAUNCHER_CFLAGS)                                                 \
 	-I$(top_srcdir) 						   \
 	-DLOCALEDIR=\"$(localedir)\" 					   \
 	-DDATADIR=\"$(datadir)\"                                           \