[maemo-commits] [maemo-commits] r16003 - in projects/haf/trunk/hildon-initscripts: . debian

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-09-04 14:23:11 +0300 (Thu, 04 Sep 2008)
New Revision: 16003

Removed:
   projects/haf/trunk/hildon-initscripts/matchbox.defs
   projects/haf/trunk/hildon-initscripts/matchbox.sh
Modified:
   projects/haf/trunk/hildon-initscripts/debian/control
Log:
Removed matchbox stuff

Modified: projects/haf/trunk/hildon-initscripts/debian/control
===================================================================
--- projects/haf/trunk/hildon-initscripts/debian/control	2008-09-04 08:34:38 UTC (rev 16002)
+++ projects/haf/trunk/hildon-initscripts/debian/control	2008-09-04 11:23:11 UTC (rev 16003)
@@ -1,18 +1,18 @@
 Source: hildon-initscripts
 Section: base
 Priority: optional
-Maintainer: Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
+Maintainer: Kimmo Hämäläinen <kimmo.hamalainen at nokia.c
 Build-Depends: debhelper (>= 4.0.0)
 Standards-Version: 3.6.2
 
 Package: hildon-initscripts
 Section: base
 Architecture: all
-Depends: matchbox-window-manager, gtk2-engines-sapwood, dbus, osso-af-startup
+Depends: gtk2-engines-sapwood, dbus, osso-af-startup
 Conflicts: hildon-base
 Replaces: hildon-base
 Description: Miscellaneous startup files.
- Matchbox startup files, run-standalone.sh, and osso-gtk.defs.
+ run-standalone.sh, and osso-gtk.defs.
 
 Package: osso-af-sb-startup
 Section: base

Deleted: projects/haf/trunk/hildon-initscripts/matchbox.defs
===================================================================
--- projects/haf/trunk/hildon-initscripts/matchbox.defs	2008-09-04 08:34:38 UTC (rev 16002)
+++ projects/haf/trunk/hildon-initscripts/matchbox.defs	2008-09-04 11:23:11 UTC (rev 16003)
@@ -1,14 +0,0 @@
-#!/bin/sh
-# matchbox.defs - Matchbox defines
-
-TITLEBAR=yes
-DESKTOPMODE=plain
-LOWLIGHT=no
-SHOWCURSOR=yes
-DIALOGMODE=static
-MBTHEME=$DEFAULTMBTHEME
-SUPERMODAL=yes
-
-if [ -f $HOME/.osso/mbtheme ]; then
-    MBTHEME=`cat $HOME/.osso/mbtheme`
-fi

Deleted: projects/haf/trunk/hildon-initscripts/matchbox.sh
===================================================================
--- projects/haf/trunk/hildon-initscripts/matchbox.sh	2008-09-04 08:34:38 UTC (rev 16002)
+++ projects/haf/trunk/hildon-initscripts/matchbox.sh	2008-09-04 11:23:11 UTC (rev 16003)
@@ -1,83 +0,0 @@
-#!/bin/sh
-# Matchbox window manager startup/shutdown script
-
-if [ "x$AF_PIDDIR" = "x" ]; then
-  echo "$0: Error, AF_PIDDIR is not defined"
-  exit 2
-fi
-if [ ! -w $AF_PIDDIR ]; then
-  echo "$0: Error, directory $AF_PIDDIR is not writable"
-  exit 2
-fi
-
-PROG=/usr/bin/matchbox-window-manager
-SVC="Matchbox window manager"
-
-case "$1" in
-start)  START=TRUE
-        ;;
-stop)   START=FALSE
-        ;;
-*)      echo "Usage: $0 {start|stop}"
-        exit 1
-        ;;
-esac
-
-if [ $START = TRUE ]; then
-  # check that required environment is defined
-  if [ "x$DISPLAY" = "x" ]; then
-    echo "$0: Error, DISPLAY is not defined"
-    exit 2
-  fi
-  if [ "x$MBTHEME" = "x" ]; then
-    echo "$0: Error, MBTHEME is not defined"
-    exit 2
-  fi
-  if [ "x$TITLEBAR" = "x" ]; then
-    echo "$0: Error, TITLEBAR is not defined"
-    exit 2
-  fi
-  if [ "x$DESKTOPMODE" = "x" ]; then
-    echo "$0: Error, DESKTOPMODE is not defined"
-    exit 2
-  fi
-  if [ "x$LOWLIGHT" = "x" ]; then
-    echo "$0: Error, LOWLIGHT is not defined"
-    exit 2
-  fi
-  if [ "x$SHOWCURSOR" = "x" ]; then
-    echo "$0: Error, SHOWCURSOR is not defined"
-    exit 2
-  fi
-  if [ "x$DIALOGMODE" = "x" ]; then
-    echo "$0: Error, DIALOGMODE is not defined"
-    exit 2
-  fi
-  if [ "x$SUPERMODAL" = "x" ]; then
-    echo "$0: Error, SUPERMODAL is not defined"
-    exit 2
-  fi
-
-# _NET_WM_PING ping handler
-export MB_HUNG_APP_HANDLER='/usr/bin/hd-hung-app-handler'
-export MB_AGGRESSIVE_PING=1
-
-  $LAUNCHWRAPPER_NICE_TRYRESTART start "$SVC" $PROG \
-      -theme $MBTHEME \
-      -use_titlebar $TITLEBAR \
-      -use_desktop_mode $DESKTOPMODE \
-      -use_lowlight $LOWLIGHT \
-      -use_cursor $SHOWCURSOR \
-      -use_dialog_mode $DIALOGMODE \
-      -use_super_modal $SUPERMODAL
-else
-  # dsmetool wants identical arguments for stopping
-  $LAUNCHWRAPPER_NICE_TRYRESTART stop "$SVC" $PROG \
-      -theme $MBTHEME \
-      -use_titlebar $TITLEBAR \
-      -use_desktop_mode $DESKTOPMODE \
-      -use_lowlight $LOWLIGHT \
-      -use_cursor $SHOWCURSOR \
-      -use_dialog_mode $DIALOGMODE \
-      -use_super_modal $SUPERMODAL
-fi