[Pkg-maemo-commits] r309 ./hildon-desktop/ubuntu: * Disable maemo-launcher config by default as we don't have it in UME yet.

[Loïc Minier]

------------------------------------------------------------
revno: 309
committer: Loïc Minier <lool at dooz.org>
branch nick: ubuntu
timestamp: Mon 2007-10-15 17:04:06 +0200
message:
  * Disable maemo-launcher config by default as we don't have it in UME yet.
modified:
  debian/changelog
  debian/rules
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-10-12 19:53:04 +0000
+++ b/debian/changelog	2007-10-15 15:04:06 +0000
@@ -1,20 +1,20 @@
 hildon-desktop (1:0.0.43-1ubuntu1) UNRELEASED; urgency=low
 
   [ Rusty Lynch ]
-  * Adding fix for startup-notification where the hildon-desktop is 
+  * Adding fix for startup-notification where the hildon-desktop is
     sending an invalid message body, resulting in a crash in the
     libstartup-notification
   * fixing the desktop.conf to work on a 1024x600 screen
-  
+
   [ Bob Spencer ]
   * Removed dummy plugin from default statusbar.
   * Changed default values to 1024x600 screen.  Need to make these dynamic
     detect in the future, or separate into different configs.
-  
+
   [ Carl Wong ]
   * Fix up dropdown menu.
   * Changed the name mobile-browser.desktop to midbrowser.desktop.
-  
+
   [ Horace Li ]
   * reset local active window cache first before sending out window update
     signal to marquee-plugins
@@ -22,7 +22,7 @@
     others-button has proper frame setting.
   * update default icon load path to /usr/share/pixmaps, and resize
     others-button size to 69 pixels.
-  * Remove floating statusbar, and insert a statusbar container to 
+  * Remove floating statusbar, and insert a statusbar container to
     marquee panel to load statusbar.
 
   [ Loic Minier ]
@@ -46,8 +46,9 @@
   * Merge patch by Bill Filler to add support for dynamically hiding and
     showing the marquee panal based on an initial setting that comes out of
     gconf.
+  * Disable maemo-launcher config by default as we don't have it in UME yet.
 
- -- Loic Minier <lool at dooz.org>  Fri, 12 Oct 2007 19:39:09 +0200
+ -- Loic Minier <lool at dooz.org>  Mon, 15 Oct 2007 16:28:07 +0200
 
 hildon-desktop (1:0.0.43-1) sardine; urgency=low
 

=== modified file 'debian/rules'
--- a/debian/rules	2007-10-12 17:05:47 +0000
+++ b/debian/rules	2007-10-15 15:04:06 +0000
@@ -15,12 +15,13 @@
 
 CFLAGS = -Wall -g
 
-ifeq (,$(findstring nolauncher,$(DEB_BUILD_OPTIONS)))
-   LAUNCHER = yes
-   LAUNCHER_DEPENDS = -Vlauncher:Depends="maemo-launcher"
-   LAUNCHER_CFLAGS = $(shell pkg-config --cflags maemo-launcher-app)
-   LAUNCHER_LDFLAGS = $(shell pkg-config --libs maemo-launcher-app)
-endif
+# we don't have maemo-launcher in UME yet
+#ifeq (,$(findstring nolauncher,$(DEB_BUILD_OPTIONS)))
+#   LAUNCHER = yes
+#   LAUNCHER_DEPENDS = -Vlauncher:Depends="maemo-launcher"
+#   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.
 ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))