upgrade paroli and remove init-script due to prior added generel autostart implementa...

SVN-Revision: 14481

diff --git a/phone/paroli/Makefile b/phone/paroli/Makefile
index 16e0c96636b8e64fc105ecd8cf106b78a0ea7a95..b5d7aade2624c9774727588663b79efb154299d1 100644 (file)
--- a/phone/paroli/Makefile
+++ b/phone/paroli/Makefile
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=paroli
-PKG_VERSION:=20090202
-PKG_REV:=497fb67c507ff58fe72c5399a37906a6aee97015
+PKG_VERSION:=20090211
+PKG_REV:=1ea74180e5ddd39b30745f4ca98b0cbec140018f
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -33,6 +33,9 @@ endef
 
 COMPONENTS:= \
        tele \
+       #paroli-i-o \
+       #paroli-contacts \
+       #paroli-msgs \
 
 define Package/paroli/description
   Paroli is an integrated phone application written in Python which uses the FSO (freesmartphone.org) DBus API
@@ -44,14 +47,13 @@ define Build/Compile
 endef
 
 define Package/paroli/install
-       $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) $(1)/usr/bin $(1)/etc/init.d $(1)/usr/share/applications/paroli $(1)/usr/share/paroli/services $(1)/usr/share/icons/paroli $(1)/etc/xdg/autostart
+       $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) $(1)/usr/bin $(1)/usr/share/applications/paroli $(1)/usr/share/paroli/services $(1)/usr/share/icons/paroli $(1)/etc/xdg/autostart
        $(CP) \
                $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
                $(1)$(PYTHON_PKG_DIR)
        $(INSTALL_BIN) \
                $(PKG_INSTALL_DIR)/usr/bin/* \
                $(1)/usr/bin/
-       $(INSTALL_BIN) ./files/paroli.init $(1)/etc/init.d/paroli
        $(foreach c, $(COMPONENTS), \
                $(INSTALL_DIR) $(1)/usr/share/paroli/applications/$(c)
                $(CP) $(PKG_INSTALL_DIR)/../usr/share/paroli/applications/$(c)/$(c).{py,edj} $(1)/usr/share/paroli/applications/$(c)/

diff --git a/phone/paroli/files/paroli.init b/phone/paroli/files/paroli.init
deleted file mode 100644 (file)
index d724ecc..0000000
--- a/phone/paroli/files/paroli.init
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2008 OpenWrt.org
-START=99
-
-start() {
-    (sleep 60 && DISPLAY=":0" /usr/bin/parolid) & # give xserver some time to get initialized
-}
-
-stop() {
-    killall parolid
-}

diff --git a/phone/paroli/patches/050-adjust-desktop-files-and-naming.patch b/phone/paroli/patches/050-adjust-desktop-files-and-naming.patch
index b1ca9abf9796b6b76dc72c754c68fb824b87c4ce..61e7cc3c1c26bfa38f0f43619e5387d0a20a7cb2 100644 (file)
--- a/phone/paroli/patches/050-adjust-desktop-files-and-naming.patch
+++ b/phone/paroli/patches/050-adjust-desktop-files-and-naming.patch
@@ -1,6 +1,6 @@
 diff -ruN paroli.orig/data/paroli-contacts.desktop paroli/data/paroli-contacts.desktop
---- paroli.orig/data/paroli-contacts.desktop   2009-02-02 14:20:01.000000000 +0100
-+++ paroli/data/paroli-contacts.desktop        2009-02-02 14:24:26.000000000 +0100
+--- paroli.orig/data/paroli-contacts.desktop   2009-02-11 02:30:43.000000000 +0100
++++ paroli/data/paroli-contacts.desktop        2009-02-11 02:32:19.000000000 +0100
 @@ -1,16 +1,13 @@
  [Desktop Entry]
 -Name=People
@@ -27,7 +27,7 @@ diff -ruN paroli.orig/data/paroli-contacts.desktop paroli/data/paroli-contacts.d
 +Categories=Telephony;TelephonyTools
 diff -ruN paroli.orig/data/parolid.desktop paroli/data/parolid.desktop
 --- paroli.orig/data/parolid.desktop   1970-01-01 01:00:00.000000000 +0100
-+++ paroli/data/parolid.desktop        2009-02-02 14:24:26.000000000 +0100
++++ paroli/data/parolid.desktop        2009-02-11 02:32:19.000000000 +0100
 @@ -0,0 +1,13 @@
 +[Desktop Entry]
 +GenericName=Paroli
@@ -43,8 +43,8 @@ diff -ruN paroli.orig/data/parolid.desktop paroli/data/parolid.desktop
 +SingleInstance=true
 +Categories=Telephony;TelephonyTools
 diff -ruN paroli.orig/data/paroli-dialer.desktop paroli/data/paroli-dialer.desktop
---- paroli.orig/data/paroli-dialer.desktop     2009-02-02 14:20:01.000000000 +0100
-+++ paroli/data/paroli-dialer.desktop  2009-02-02 14:24:26.000000000 +0100
+--- paroli.orig/data/paroli-dialer.desktop     2009-02-11 02:30:43.000000000 +0100
++++ paroli/data/paroli-dialer.desktop  2009-02-11 02:32:19.000000000 +0100
 @@ -1,16 +1,13 @@
  [Desktop Entry]
 -Name=Tele
@@ -70,7 +70,7 @@ diff -ruN paroli.orig/data/paroli-dialer.desktop paroli/data/paroli-dialer.deskt
 +Categories=Telephony;TelephonyTools
 diff -ruN paroli.orig/data/paroli-i-o.desktop paroli/data/paroli-i-o.desktop
 --- paroli.orig/data/paroli-i-o.desktop        1970-01-01 01:00:00.000000000 +0100
-+++ paroli/data/paroli-i-o.desktop     2009-02-02 14:24:26.000000000 +0100
++++ paroli/data/paroli-i-o.desktop     2009-02-11 02:32:19.000000000 +0100
 @@ -0,0 +1,13 @@
 +[Desktop Entry]
 +GenericName=I/O
@@ -86,7 +86,7 @@ diff -ruN paroli.orig/data/paroli-i-o.desktop paroli/data/paroli-i-o.desktop
 +SingleInstance=true
 +Categories=GTK;Application;Office;
 diff -ruN paroli.orig/data/paroli-io.desktop paroli/data/paroli-io.desktop
---- paroli.orig/data/paroli-io.desktop 2009-02-02 14:20:01.000000000 +0100
+--- paroli.orig/data/paroli-io.desktop 2009-02-11 02:30:43.000000000 +0100
 +++ paroli/data/paroli-io.desktop      1970-01-01 01:00:00.000000000 +0100
 @@ -1,16 +0,0 @@
 -[Desktop Entry]
@@ -107,8 +107,8 @@ diff -ruN paroli.orig/data/paroli-io.desktop paroli/data/paroli-io.desktop
 -Categories=GTK;Application;Office;
 \ No newline at end of file
 diff -ruN paroli.orig/data/paroli-launcher.desktop paroli/data/paroli-launcher.desktop
---- paroli.orig/data/paroli-launcher.desktop   2009-02-02 14:20:01.000000000 +0100
-+++ paroli/data/paroli-launcher.desktop        2009-02-02 14:24:26.000000000 +0100
+--- paroli.orig/data/paroli-launcher.desktop   2009-02-11 02:30:43.000000000 +0100
++++ paroli/data/paroli-launcher.desktop        2009-02-11 02:32:19.000000000 +0100
 @@ -1,11 +1,13 @@
  [Desktop Entry]
 -Name=PLauncher
@@ -128,8 +128,8 @@ diff -ruN paroli.orig/data/paroli-launcher.desktop paroli/data/paroli-launcher.d
 +SingleInstance=true
 +Categories=Telephony;TelephonyTools
 diff -ruN paroli.orig/data/paroli-msgs.desktop paroli/data/paroli-msgs.desktop
---- paroli.orig/data/paroli-msgs.desktop       2009-02-02 14:20:01.000000000 +0100
-+++ paroli/data/paroli-msgs.desktop    2009-02-02 14:24:26.000000000 +0100
+--- paroli.orig/data/paroli-msgs.desktop       2009-02-11 02:30:43.000000000 +0100
++++ paroli/data/paroli-msgs.desktop    2009-02-11 02:32:19.000000000 +0100
 @@ -1,16 +1,13 @@
  [Desktop Entry]
 -Name=Msgs
@@ -155,7 +155,7 @@ diff -ruN paroli.orig/data/paroli-msgs.desktop paroli/data/paroli-msgs.desktop
 +Categories=Telephony;TelephonyTools
 diff -ruN paroli.orig/data/tele.desktop paroli/data/tele.desktop
 --- paroli.orig/data/tele.desktop      1970-01-01 01:00:00.000000000 +0100
-+++ paroli/data/tele.desktop   2009-02-02 14:24:26.000000000 +0100
++++ paroli/data/tele.desktop   2009-02-11 02:32:19.000000000 +0100
 @@ -0,0 +1,13 @@
 +[Desktop Entry]
 +GenericName=Tele
@@ -170,202 +170,10 @@ diff -ruN paroli.orig/data/tele.desktop paroli/data/tele.desktop
 +Type=Application
 +SingleInstance=true
 +Categories=Telephony;TelephonyTools
-diff -ruN paroli.orig/paroli-scripts/paroli paroli/paroli-scripts/paroli
---- paroli.orig/paroli-scripts/paroli  2009-02-02 14:20:01.000000000 +0100
-+++ paroli/paroli-scripts/paroli       1970-01-01 01:00:00.000000000 +0100
-@@ -1,188 +0,0 @@
--#!/usr/bin/python
--#
--#    Paroli
--#
--#    copyright 2008  Openmoko
--#
--#    This file is part of Paroli.
--#
--#    Paroli is free software: you can redistribute it and/or modify it
--#    under the terms of the GNU General Public License as published by
--#    the Free Software Foundation, either version 3 of the License, or
--#    (at your option) any later version.
--#
--#    Paroli is distributed in the hope that it will be useful, but
--#    WITHOUT ANY WARRANTY; without even the implied warranty of
--#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--#    General Public License for more details.
--#
--#    You should have received a copy of the GNU General Public License
--#    along with Paroli.  If not, see <http://www.gnu.org/licenses/>.
--
--"""Paroli main script
--
--This script will load all the paroli plugins, then init the services,
--and finally run the application 'Paroli-Launcher'
--"""
--
--# All the needed system modules
--import sys
--import os
--from optparse import OptionParser
--import ConfigParser
--import logging
--
--# This is to make sure that we use the local tichy lib if run from the
--# test directory
--sys.path.insert(0, '../paroli-core/')
--sys.path.insert(0, '../paroli-graphics-backend/')
--
--import tichy
--
--logger = logging.getLogger('')
--
--
--def parse_options():
--    """Parse the command line options
--
--    :Returns: the OptionParser result object
--    """
--    parser = OptionParser()
--    parser.add_option("", "--cfgfile", dest="cfg_file",
--                      help="specigy the configuration file to use",
--                      metavar="FILE", default=None)
--    parser.add_option("", "--show-services", dest='show_services',
--                      action='store_true', default=False,
--                      help="print some info about the services and exit")
--
--    (options, args) = parser.parse_args()
--    return options
--
--
--def setup_logging():
--    """Set up two logging handlers, one in the log file, one in the
--    stdoutput"""
--    logging.basicConfig(
--        level=logging.DEBUG,
--        format='%(asctime)s %(name)-8s %(levelname)-8s %(message)s',
--        filename='/tmp/paroli.log', filemode='w')
--
--    formatter = logging.Formatter(
--        '%(name)-8s %(levelname)-8s %(message)s')
--    stream_log = logging.StreamHandler()
--    stream_log.setFormatter(formatter)
--    stream_log.setLevel(logging.INFO)
--    logger.addHandler(stream_log)
--
--
--def parse_config(cfg_file=None):
--    """parse the config files
--
--    We look into 3 locations : first the local dir, then /etc/paroli/,
--    then the home directory
--
--    :Parameters:
--
--        cfg_file : str | None
--            the configuartion file to use, or None for default config
--            files
--
--    :Returns: the ConfigParser object
--    """
--    config = ConfigParser.SafeConfigParser()
--    if not cfg_file:
--        local_path = "./paroli.cfg"
--        system_path = "/etc/paroli/paroli.cfg"
--        home_path = os.path.expanduser("~/.paroli/paroli.cfg")
--        files = [local_path, system_path, home_path]
--    else:
--        files = cfg_file.split(':')
--    for path in files:
--        logger.info("read config file %s", path)
--        config.read(path)
--    return config
--
--
--class InitAll(tichy.Tasklet):
--    """Perform all basic initialization of services"""
--
--    def run(self):
--        # Register on the GSM Network
--        gsm_service = tichy.Service('GSM')
--        yield gsm_service.init()
--        # Set SIM info
--        gsm_sim = tichy.Service('SIM')
--        yield gsm_sim.set_info()
--        # Get all the contacts
--        contacts = tichy.Service('Contacts')
--        yield contacts.init()
--        messages_service = tichy.Service('Messages')
--        yield messages_service.init()
--
--        # Finally we can start to listen for incoming calls
--        logger.info("start AutoAnswerCall")
--        yield AutoAnswerCall()
--
--class AutoAnswerCall(tichy.Tasklet):
--
--    def run(self):
--        # We don't create any window, just run in the background...
--        # warning; that would only work with gtk or etk backend...
--        gsm_service = tichy.Service('GSM')
--        while True:
--            call = yield tichy.Wait(gsm_service, 'incoming-call')
--            logger.info("got incoming call")
--            caller_service = tichy.Service('Caller')
--            yield caller_service.call(None, call)
--
--
--if __name__ == '__main__':
--    options = parse_options()
--
--    setup_logging()
--    config = parse_config(cfg_file=options.cfg_file)
--
--    logger.info("init gui")
--    tichy.init_gui(None)
--
--    # We import all the modules into the plugin directory
--    default_plugins_path = '/usr/share/tichy/plugins'
--    plugins_dir = config.get('plugins', 'path', default_plugins_path)
--    plugins_dirs = plugins_dir.split(':')
--    for plugins_dir in plugins_dirs:
--        try:
--            logger.info("try to load plugins in %s", plugins_dir)
--            tichy.plugins.import_all(plugins_dir)
--        except IOError:
--            logger.info("failed to load plugins in %s", plugins_dir)
--
--    # Set all the default services
--    if config.has_option('services', 'defaults'):
--        defaults = config.get('services', 'defaults').split(',')
--        for default in defaults:
--            if not default:
--                continue
--            service, name = default.strip().split(':')
--            logger.info("set service %s to %s", service, name)
--            tichy.Service.set_default(service, name)
--
--    if options.show_services:
--        from tichy.service import print_infos
--        print_infos()
--        sys.exit(0)
--
--    def on_done():
--        """called when the main application quit"""
--        tichy.mainloop.quit()
--
--    logger.info("start InitAll")
--    InitAll().start()
--
--    logger.info("start launcher application")
--    launcher = tichy.Application.find_by_name('Paroli-Launcher')
--    # '01' for standalone and advanced-mode
--    launcher(None, '01').start(callback=on_done)
--
--    logger.info("starting mainloop")
--    tichy.mainloop.run()
--    logger.info("quit")
 diff -ruN paroli.orig/paroli-scripts/parolid paroli/paroli-scripts/parolid
 --- paroli.orig/paroli-scripts/parolid 1970-01-01 01:00:00.000000000 +0100
-+++ paroli/paroli-scripts/parolid      2009-02-02 14:20:41.000000000 +0100
-@@ -0,0 +1,289 @@
++++ paroli/paroli-scripts/parolid      2009-02-11 02:32:19.000000000 +0100
+@@ -0,0 +1,286 @@
 +#!/usr/bin/python
 +#
 +#    Paroli
@@ -600,9 +408,6 @@ diff -ruN paroli.orig/paroli-scripts/parolid paroli/paroli-scripts/parolid
 +    setup_logging()
 +    tichy.config.parse(cfg_file=options.cfg_file)
 +
-+    logger.info("init gui")
-+    tichy.init_gui(None)
-+
 +    # We import all the modules into the plugin directory
 +    default_plugins_path = '/usr/share/tichy/plugins'
 +    plugins_dir = tichy.config.get('plugins', 'path', default_plugins_path)
@@ -656,9 +461,9 @@ diff -ruN paroli.orig/paroli-scripts/parolid paroli/paroli-scripts/parolid
 +    tichy.mainloop.run()
 +    logger.info("quit")
 diff -ruN paroli.orig/paroli-scripts/paroli-launcher paroli/paroli-scripts/paroli-launcher
---- paroli.orig/paroli-scripts/paroli-launcher 2009-02-02 14:20:01.000000000 +0100
+--- paroli.orig/paroli-scripts/paroli-launcher 2009-02-11 02:30:43.000000000 +0100
 +++ paroli/paroli-scripts/paroli-launcher      1970-01-01 01:00:00.000000000 +0100
-@@ -1,289 +0,0 @@
+@@ -1,286 +0,0 @@
 -#!/usr/bin/python
 -#
 -#    Paroli
@@ -893,9 +698,6 @@ diff -ruN paroli.orig/paroli-scripts/paroli-launcher paroli/paroli-scripts/parol
 -    setup_logging()
 -    tichy.config.parse(cfg_file=options.cfg_file)
 -
--    logger.info("init gui")
--    tichy.init_gui(None)
--
 -    # We import all the modules into the plugin directory
 -    default_plugins_path = '/usr/share/tichy/plugins'
 -    plugins_dir = tichy.config.get('plugins', 'path', default_plugins_path)
@@ -949,8 +751,8 @@ diff -ruN paroli.orig/paroli-scripts/paroli-launcher paroli/paroli-scripts/parol
 -    tichy.mainloop.run()
 -    logger.info("quit")
 diff -ruN paroli.orig/setup.py paroli/setup.py
---- paroli.orig/setup.py       2009-02-02 14:20:01.000000000 +0100
-+++ paroli/setup.py    2009-02-02 14:33:41.000000000 +0100
+--- paroli.orig/setup.py       2009-02-11 02:30:43.000000000 +0100
++++ paroli/setup.py    2009-02-11 02:35:22.000000000 +0100
 @@ -84,14 +84,15 @@
        author_email='mirko@openmoko.org',
        package_dir = {'': 'paroli-core'},
@@ -960,14 +762,25 @@ diff -ruN paroli.orig/setup.py paroli/setup.py
        # XXX: Those locations may not work on the neo !
        data_files = [('applications',
 -                     ['data/paroli-launcher.desktop',
--                      'data/paroli-io.desktop',
+-                      #'data/paroli-io.desktop',
+-                      #'data/paroli-contacts.desktop',
+-                      #'data/paroli-msgs.desktop',
+-                      #'data/paroli-dialer.desktop'
 +                     ['data/parolid.desktop',
 +                      'data/paroli-i-o.desktop',
-                       'data/paroli-contacts.desktop',
-                       'data/paroli-msgs.desktop',
--                      'data/paroli-dialer.desktop']),
++                      'data/paroli-contacts.desktop',
++                      'data/paroli-msgs.desktop',
 +                      'data/paroli-dialer.desktop',
-+                      'data/tele.desktop']),
++                      'data/tele.desktop'
+                       ]),
                      (os.path.join(sys.prefix, 'share/pixmaps/'),
                       ['data/tichy']),
-                     ('../../etc/paroli/', ['data/paroli.cfg'])] \
+@@ -102,7 +103,7 @@
+ 
+       cmdclass = {'build': my_build,
+                   'clean': my_clean},
+-      
++
+       )
+ 
+