[maemo-commits] [maemo-commits] r18049 - projects/haf/trunk/maemo-launcher/debian

Tue Apr 14 10:31:11 EEST 2009

Author: makarhun
Date: 2009-04-14 10:31:04 +0300 (Tue, 14 Apr 2009)
New Revision: 18049

Added:
   projects/haf/trunk/maemo-launcher/debian/maemo-launcher.init
Modified:
   projects/haf/trunk/maemo-launcher/debian/changelog
   projects/haf/trunk/maemo-launcher/debian/compat
   projects/haf/trunk/maemo-launcher/debian/control
   projects/haf/trunk/maemo-launcher/debian/copyright
Log:
sync to 0.34+

Modified: projects/haf/trunk/maemo-launcher/debian/changelog
===================================================================

--- projects/haf/trunk/maemo-launcher/debian/changelog	2009-04-09 10:29:47 UTC (rev 18048)
+++ projects/haf/trunk/maemo-launcher/debian/changelog	2009-04-14 07:31:04 UTC (rev 18049)
@@ -1,9 +1,51 @@
-maemo-launcher (0.32-2) unstable; urgency=low
+maemo-launcher (0.34-2) unstable; urgency=low
 
   * Adds cpp booster (Fixes: #108695)
 
  -- Janne Karhunen <Janne.Karhunen at nokia.com>  Tue, 07 Apr 2009 13:36:27 +0300
 
+maemo-launcher (0.34-1+0m5) unstable; urgency=low
+
+  * This entry has been added by BIFH queue processor
+    Suffix +0m5 added to package revision
+
+ -- pekka lundstrom <pekka.lundstrom at nokia.com>  Wed, 18 Mar 2009 12:47:22 +0200
+
+maemo-launcher (0.34-1) unstable; urgency=low
+
+  * New upstream release.
+    - Make the hildon booster link against: libdrm, xcomposite, xdamage, xv,
+      gstreamer-base-0.10, gstreamer-controller-0.10, liboil-0.3, bluez,
+      libpulse, and alarm. (Fixes: NB#96648)
+  * Use ${binary:Version} instead of deprecated ${Source-Version}.
+  * Switch to debhelper compatibility level 5.
+    - Fix dh_strip --dbg-package argument to be the debug package.
+  * Rename debian/init.d to debian/maemo-launcher.init.
+  * Remove obsolete libhildonhelp-dev. Fixes: NB#105122
+
+ -- Guillem Jover <guillem.jover at nokia.com>  Tue, 17 Mar 2009 20:13:27 +0200
+
+maemo-launcher (0.33-1) unstable; urgency=low
+
+  * New upstream release.
+    - Remove RCS keywords.
+    - Use UTF-8 copyright symbol.
+    - Rename client test application to to app-hildon.
+    - Add a new app-console test client.
+    - Connect stdio descriptors from invoked program to the invoker.
+    - Forward environment variables from invoker to the launcher.
+      (Fixes: NB#92995)
+  * Take over Xsession script from upstart. (Fixes: NB#103352)
+  * Reference GPL-2 from common-licenses instead of just GPL.
+  * Set Priority for maemo-launcher-dbg to extra.
+  * Improve package descriptions.
+  * Update upstream copyright years in debian/copyright.
+  * Update Build-Depends:
+    - Remove obsolete libhildonhelp-dev.
+    - Rename gtkhtml-dev to gtkhtml3.14-dev. (Fixes: NB#105122)
+
+ -- Guillem Jover <guillem.jover at nokia.com>  Tue, 10 Mar 2009 22:30:43 +0200
+
 maemo-launcher (0.32-1) unstable; urgency=low
 
   * New Upstream Release.

Modified: projects/haf/trunk/maemo-launcher/debian/compat
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/compat	2009-04-09 10:29:47 UTC (rev 18048)
+++ projects/haf/trunk/maemo-launcher/debian/compat	2009-04-14 07:31:04 UTC (rev 18049)
@@ -1 +1 @@
-4
+5

Modified: projects/haf/trunk/maemo-launcher/debian/control
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/control	2009-04-09 10:29:47 UTC (rev 18048)
+++ projects/haf/trunk/maemo-launcher/debian/control	2009-04-14 07:31:04 UTC (rev 18049)
@@ -2,30 +2,35 @@
 Section: embedded
 Priority: optional
 Maintainer: Janne Karhunen <Janne.Karhunen at nokia.com>
-Build-Depends: debhelper (>= 4.0.0), libgtk2.0-dev (>= 2.6.4-1),
- libfontconfig1-dev, libpango1.0-dev, libdbus-1-dev (>= 0.60-1),
- gtkhtml-dev, clinkc-dev, libosso-dev, libosso-gnomevfs2-dev (>= 2.8.0-1),
- libhildon1-dev, libhildonmime-dev, libhildonhelp-dev, libhildonfm2-dev,
- libhildondesktop1-dev
+Build-Depends: debhelper (>= 5.0.0), libgtk2.0-dev (>= 2.6.4),
+ libfontconfig1-dev, libpango1.0-dev, libdbus-1-dev (>= 0.60),
+# These are just linked to force resolving symbols, but not actually used:
+ libdrm-dev, libxcomposite-dev, libxdamage-dev, libxv-dev, liboil0.3-dev,
+ libbluetooth3-dev, libpulse-dev, libalarm-dev, libgstreamer0.10-dev,
+ gtkhtml3.14-dev, clinkc-dev, libosso-dev, libosso-gnomevfs2-dev (>= 2.8.0),
+ libhildon1-dev, libhildonmime-dev, libhildonfm2-dev, libhildondesktop1-dev
+
 # To build the QT Booster we need libqt4-dev
 Standards-Version: 3.7.2
 
 Package: maemo-launcher
 Architecture: any
 Depends: ${shlibs:Depends}, hildon-initscripts
-Description: Maemo Launcher for GTK applications
- Maemo Launcher for any gtk+ application. Tries to reduce startup time by
- pre-initializing the state of some libraries and then dynamically loading
- the applications.
+Replaces: system-services
+Description: application startup accelerator for maemo
+ Maemo launcher tries to reduce startup time by pre-initializing the state
+ of some libraries using the booster modules and then dynamically loading
+ the applications. It currently supports null, GTK+, QT and CPP boosters.
 
 Package: maemo-launcher-dbg
 Architecture: any
 Section: devel
-Depends: maemo-launcher (= ${Source-Version})
-Description: Maemo Launcher for GTK applications - debugging symbols
- Maemo Launcher for any gtk+ application. Tries to reduce startup time by
- pre-initializing the state of some libraries and then dynamically loading
- the applications.
+Priority: extra
+Depends: maemo-launcher (= ${binary:Version})
+Description: application startup accelerator for maemo - debugging symbols
+ Maemo launcher tries to reduce startup time by pre-initializing the state
+ of some libraries using the booster modules and then dynamically loading
+ the applications. It currently supports null, GTK+, QT and CPP boosters.
  .
  This package provides the debugging symbols for maemo-launcher.
 
@@ -33,10 +38,10 @@
 Architecture: all
 Section: libdevel
 Depends: debhelper (>= 4)
-Description: Maemo Launcher for GTK applications - development files
- Maemo Launcher for any gtk+ application. Tries to reduce startup time by
- pre-initializing the state of some libraries and then dynamically loading
- the applications.
+Description: application startup accelerator for maemo - development files
+ Maemo launcher tries to reduce startup time by pre-initializing the state
+ of some libraries using the booster modules and then dynamically loading
+ the applications. It currently supports null, GTK+, QT and CPP boosters.
  .
  This package provides the development files needed to build boosters
  and applications using the maemo-launcher.

Modified: projects/haf/trunk/maemo-launcher/debian/copyright
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/copyright	2009-04-09 10:29:47 UTC (rev 18048)
+++ projects/haf/trunk/maemo-launcher/debian/copyright	2009-04-14 07:31:04 UTC (rev 18049)
@@ -5,7 +5,7 @@
 
 Copyright:
 
-    Copyright © 2005, 2006, 2007, 2008 Nokia Corporation
+    Copyright © 2005, 2006, 2007, 2008, 2009 Nokia Corporation
 
 Upstream Authors:
 
@@ -28,5 +28,5 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 

Copied: projects/haf/trunk/maemo-launcher/debian/maemo-launcher.init (from rev 18019, projects/haf/trunk/maemo-launcher/debian/init.d)
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/init.d	2009-04-06 09:33:55 UTC (rev 18019)
+++ projects/haf/trunk/maemo-launcher/debian/maemo-launcher.init	2009-04-14 07:31:04 UTC (rev 18049)
@@ -0,0 +1,100 @@
+#! /bin/sh
+#
+
+set -e
+
+NAME=maemo-launcher
+DESC="Maemo Launcher"
+DAEMON=/usr/bin/$NAME
+# XXX: Disable the application crash notification (you might want to
+#      add '--send-app-died' back...)
+DAEMON_BASE_OPTS="--daemon --booster gtk"
+PIDFILE=/tmp/$NAME.pid
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+test -x $DAEMON || exit 0
+
+# Those files set needed environment variables for the Maemo applications
+# FIXME: but this should not be needed either, and should be inherited from
+#        the session instead.
+
+set_login_vars()
+{
+  export USER=$1
+  export LOGNAME=$USER
+  PWENTRY=`getent passwd $USER`
+  export HOME=`echo $PWENTRY | cut -d: -f6`
+  export SHELL=`echo $PWENTRY | cut -d: -f7`
+}
+
+# OSSO AF Init definitions
+DEFSDIR=/etc/osso-af-init/
+
+# When inside scratchbox we are not really root nor do we have 'user' user
+if [ -f /targets/links/scratchbox.config ]; then
+  set_login_vars `id -u -n`
+else
+  # FIXME: this is wrong wrong wrong, and should not be hardcoded, this script
+  #        belongs in the session level instead.
+  set_login_vars user
+fi
+
+if [ -e $DEFSDIR/af-defines.sh ]
+then
+  . $DEFSDIR/af-defines.sh
+else
+  echo "$DEFSDIR/af-defines.sh not found!"
+  exit 1
+fi
+
+# XXX: Reset the login variables, as af-defines.sh makes a mess and stomps
+#      on some of the variables we have already initialized!
+if [ -f /targets/links/scratchbox.config ]; then
+  set_login_vars `id -u -n`
+  DAEMON_OPTS="$DAEMON_BASE_OPTS"
+else
+  set_login_vars user
+  if [ `id -u` = 0 ]; then
+    CHUID="--chuid user"
+    # Make sure the launcher is not an OOM candidate
+    NICE="--nicelevel -1"
+  fi
+  DAEMON_OPTS="$DAEMON_BASE_OPTS --quiet"
+fi
+
+case "$1" in
+  start)
+    echo -n "Starting $DESC: $NAME"
+    start-stop-daemon --start --quiet --pidfile $PIDFILE $CHUID $NICE \
+      --exec $DAEMON -- $DAEMON_OPTS || echo -n " start failed"
+    echo "."
+    ;;
+  stop)
+    echo -n "Stopping $DESC: $NAME"
+    start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $DAEMON \
+      || echo -n " not running"
+    echo "."
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  reload|force-reload)
+    echo -n "Reloading $DESC: $NAME"
+    start-stop-daemon --stop --signal USR1 --quiet --pidfile $PIDFILE \
+      --exec $DAEMON || echo -n " not running"
+    echo "."
+    ;;
+  *)
+    N=/etc/init.d/$NAME
+    echo "Usage: $N {start|stop|restart|force-reload}" >&2
+    exit 1
+    ;;
+esac
+
+exit 0
+
+# vim: syn=sh
+


Property changes on: projects/haf/trunk/maemo-launcher/debian/maemo-launcher.init
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:mergeinfo
   + 


