[Pkg-maemo-commits] r310 ./hildon-desktop/ubuntu: * Fix default configuration for hildon-desktop.

[Loïc Minier]

------------------------------------------------------------
revno: 310
committer: Loïc Minier <lool at dooz.org>
branch nick: ubuntu
timestamp: Tue 2007-10-30 19:45:15 +0100
message:
  * Fix default configuration for hildon-desktop.
    - Merge Horace's configuration files into the debian/config/ and data/
      dirs.
    - Depend on mobile-basic-flash as this plugin is referenced in the default
      config.
    - Recommend moblin-keyboard-manager as this plugin is referenced in the
      default config but optional.
    - Recommend marquee-plugins as it ships most of the plugins for the
      marquee.
modified:
  data/marquee.conf.in
  debian/changelog
  debian/config/desktop.conf
  debian/config/home-layout.conf
  debian/config/home.conf
  debian/config/statusbar.conf
  debian/control
-------------- next part --------------
=== modified file 'data/marquee.conf.in'
--- a/data/marquee.conf.in	2007-08-30 05:43:31 +0000
+++ b/data/marquee.conf.in	2007-10-30 18:45:15 +0000
@@ -1,8 +1,6 @@
-[@hildonnavigatordesktopentrydir@/others-button.desktop]
+[@hildonmarqueedesktopentrydir@/showhome-plugin.desktop]
 [@hildonmarqueedesktopentrydir@/drop-down-menu.desktop]
-[@hildonmarqueedesktopentrydir@/nav-prev-app.desktop]
 [@hildonmarqueedesktopentrydir@/clock-plugin.desktop]
-[@hildonmarqueedesktopentrydir@/nav-next-app.desktop]
 [@hildonmarqueedesktopentrydir@/statusbar-container.desktop]
 [@hildonmarqueedesktopentrydir@/close-app.desktop]
 #[@hildonmarqueedesktopentrydir@/dummy-panel.desktop]

=== modified file 'debian/changelog'
--- a/debian/changelog	2007-10-15 15:04:06 +0000
+++ b/debian/changelog	2007-10-30 18:45:15 +0000
@@ -47,8 +47,17 @@
     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.
+  * Fix default configuration for hildon-desktop.
+    - Merge Horace's configuration files into the debian/config/ and data/
+      dirs.
+    - Depend on mobile-basic-flash as this plugin is referenced in the default
+      config.
+    - Recommend moblin-keyboard-manager as this plugin is referenced in the
+      default config but optional.
+    - Recommend marquee-plugins as it ships most of the plugins for the
+      marquee.
 
- -- Loic Minier <lool at dooz.org>  Mon, 15 Oct 2007 16:28:07 +0200
+ -- Loic Minier <lool at dooz.org>  Tue, 30 Oct 2007 19:44:33 +0100
 
 hildon-desktop (1:0.0.43-1) sardine; urgency=low
 

=== modified file 'debian/config/desktop.conf'
--- a/debian/config/desktop.conf	2007-09-28 11:45:55 +0000
+++ b/debian/config/desktop.conf	2007-10-30 18:45:15 +0000
@@ -1,31 +1,21 @@
-[Tasknavigator]
+[Marquee]
 X-Type=panel_box
 X-Position-X=0
 X-Position-Y=0
-X-Size-Width=480
-X-Size-Height=80
-X-Orientation=left
-X-UI-Policy=libtasknavigatorpolicy.so
+X-Size-Width=800
+X-Size-Height=52
+X-Orientation=top
 X-Is-Ordered=1
-X-Config-File=tasknavigator.conf
-X-Plugin-Dir=/usr/share/applications/hildon-navigator
+X-Config-File=marquee.conf
+X-Plugin-Dir=/usr/share/applications/hildon-marquee
 
 [Home]
 X-Type=home
+X-Padding-Left=0
+X-Padding-Right=0
+X-Padding-Top=0
+X-Padding-Bottom=0
 X-Is-Ordered=0
 X-Load-New-Plugins=1
 X-Config-File=home.conf
 X-Plugin-Dir=/usr/share/applications/hildon-home
-
-[Statusbar]
-X-Type=panel_expandable
-X-Position-X=423
-X-Position-Y=0
-X-Size-Width=282
-X-Size-Height=50
-X-Orientation=top
-X-UI-Policy=libstatusbarpolicy.so
-X-Is-Ordered=1
-X-Load-New-Plugins=1
-X-Config-File=statusbar.conf
-X-Plugin-Dir=/usr/share/applications/hildon-status-bar

=== modified file 'debian/config/home-layout.conf'
--- a/debian/config/home-layout.conf	2007-09-24 13:51:04 +0000
+++ b/debian/config/home-layout.conf	2007-10-30 18:45:15 +0000
@@ -1,11 +1,6 @@
-[/usr/share/applications/hildon-home/isearch-applet.desktop]
-X=10
-Y=10
-
-[/usr/share/applications/hildon-home/promo-plugin.desktop]
-X=410
-Y=140
-
-[/usr/share/applications/hildon-home/tutorial-home.desktop]
-X=410
-Y=290
+[/usr/share/applications/hildon-home/mobile-basic-home.desktop]
+X=0
+Y=-60
+X-home-applet-stack-index=1
+X-home-applet-width=1024
+X-home-applet-height=548

=== modified file 'debian/config/home.conf'
--- a/debian/config/home.conf	2007-09-07 08:18:18 +0000
+++ b/debian/config/home.conf	2007-10-30 18:45:15 +0000
@@ -1,3 +1,1 @@
-[/usr/share/applications/hildon-home/isearch-applet.desktop]
-[/usr/share/applications/hildon-home/promo-plugin.desktop]
-[/usr/share/applications/hildon-home/tutorial-home.desktop]
+[/usr/share/applications/hildon-home/mobile-basic-home.desktop]

=== modified file 'debian/config/statusbar.conf'
--- a/debian/config/statusbar.conf	2007-09-07 08:18:18 +0000
+++ b/debian/config/statusbar.conf	2007-10-30 18:45:15 +0000
@@ -1,10 +1,2 @@
-[/usr/share/applications/hildon-status-bar/hildon-status-bar-battery.desktop]
-[/usr/share/applications/hildon-status-bar/hildon-status-bar-internet.desktop]
-[/usr/share/applications/hildon-status-bar/sound.desktop]
-[/usr/share/applications/hildon-status-bar/hildon-status-bar-display.desktop]
-[/usr/share/applications/hildon-status-bar/presence.desktop]
-[/usr/share/applications/hildon-status-bar/contact.desktop]
-[/usr/share/applications/hildon-status-bar/hildon-status-bar-bluetooth.desktop]
-[/usr/share/applications/hildon-status-bar/location.desktop]
-[/usr/share/applications/hildon-status-bar/hildon-status-bar-alarm.desktop]
-[/usr/share/applications/hildon-status-bar/hildon-status-bar-usb.desktop]
+[/usr/share/applications/hildon-status-bar/hildon-status-bar-keyboard.desktop]
+#[/usr/share/applications/hildon-status-bar/dummy-panel.desktop]

=== modified file 'debian/control'
--- a/debian/control	2007-10-12 17:05:47 +0000
+++ b/debian/control	2007-10-30 18:45:15 +0000
@@ -9,7 +9,8 @@
 Package: hildon-desktop
 Section: x11
 Architecture: any
-Depends:  ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends}, maemo-af-desktop-l10n-mr | maemo-af-desktop-l10n-mr0 | maemo-af-desktop-l10n-mr1
+Depends:  ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends}, maemo-af-desktop-l10n-mr | maemo-af-desktop-l10n-mr0 | maemo-af-desktop-l10n-mr1, mobile-basic-flash
+Recommends: moblin-keyboard-manager, marquee-plugins
 Conflicts: maemo-af-desktop (<< 3.0.0), maemo-af-desktop-config
 Description: Desktop environment for embedded devices
  Hildon Desktop is a desktop environment for embedded devices. It