- upgrade paroli to recent version - don't use <install>-script due it's broken ...

SVN-Revision: 16584

diff --git a/phone/paroli/Makefile b/phone/paroli/Makefile
index 766819f30e529d3dcdef960e4cb2b66b131b3cd5..d432f8a2edbdad2cac4d5f72fd70b0510dfce292 100644 (file)
--- a/phone/paroli/Makefile
+++ b/phone/paroli/Makefile
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=paroli
-PKG_VERSION:=20090227
-PKG_REV:=08c924538448e7de202432f470564764852df8a6
+PKG_VERSION:=20090605
+PKG_REV:=120c1aca795fd28b50e361eb908786ed25f98253
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -27,53 +27,112 @@ define Package/paroli
   SECTION:=phone
   CATEGORY:=Phone
   TITLE:=integrated phone application
-  DEPENDS:=+python +fso +python-evas +python-ecore +python-edje +python-e_dbus \
-           +python-etk +python-expat +dbus-utils
-  URL:=http://wiki.openmoko.org/wiki/Paroli
+  DEPENDS:=+python +fso-frameworkd +python-evas +python-ecore +python-edje +python-e_dbus +python-etk +python-elementary +python-expat +dbus-utils-x
+  URL:=http://paroli-project.org
 endef
 
-COMPONENTS:= \
-       tele \
-       msgs \
-       people \
-
 define Package/paroli/description
-  Paroli is an integrated phone application written in Python which uses the FSO (freesmartphone.org) DBus API
+  Paroli is a phone suite written in Python which uses the FSO (freesmartphone.org) DBus API
 endef
 
 define Build/Compile
        $(call Build/Compile/PyMod,,build)
-       $(call Build/Compile/PyMod,,install --prefix="$(PKG_INSTALL_DIR)/usr")
 endef
 
 define Package/paroli/install
-       $(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
+       $(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)/usr/share/elementary/themes \
+        $(1)/usr/share/dbus-1/system-services \
+        $(1)/etc/dbus-1/system.d \
+               $(1)/etc/paroli \
+               $(1)/etc/xdg/autostart
+
+    # CORE
        $(CP) \
-               $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
-               $(1)$(PYTHON_PKG_DIR)
+               $(PKG_BUILD_DIR)/paroli-core/tichy \
+               $(1)$(PYTHON_PKG_DIR)/
        $(INSTALL_BIN) \
-               $(PKG_INSTALL_DIR)/usr/bin/* \
+               $(PKG_BUILD_DIR)/paroli-scripts/paroli \
                $(1)/usr/bin/
-       $(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)/
-#              $(CP) $(PKG_INSTALL_DIR)/../usr/share/paroli/applications/$(c)/icon.png $(1)/usr/share/icons/paroli/$(c).png
-               $(CP) $(PKG_INSTALL_DIR)/../data/tichy $(1)/usr/share/icons/paroli/$(c).png
-               $(CP) $(PKG_INSTALL_DIR)/usr/applications/$(c).desktop $(1)/usr/share/applications/paroli/
-       )
-       $(CP) \
-               $(PKG_INSTALL_DIR)/../usr/share/paroli/services/* \
-               $(1)/usr/share/paroli/services/
        $(CP) \
-               $(PKG_INSTALL_DIR)/../data/tichy \
+               $(PKG_BUILD_DIR)/data/tichy \
                $(1)/usr/share/icons/paroli/parolid.png
        $(CP) \
-               $(PKG_INSTALL_DIR)/usr/applications/parolid.desktop \
+               ./files/desktop-files/parolid.desktop \
                $(1)/etc/xdg/autostart/
        $(CP) \
-               $(PKG_INSTALL_DIR)/../etc/* \
-               $(1)/etc/
-       $(CP) ./files/paroli.cfg $(1)/etc/paroli.cfg
+               $(PKG_BUILD_DIR)/data/paroli.edj \
+               $(1)/usr/share/elementary/themes/
+       $(CP) \
+               ./files/paroli.cfg \
+               $(1)/etc/paroli/
+       $(CP) \
+               $(PKG_BUILD_DIR)/data/dbus/tichy.conf \
+               $(1)/etc/dbus-1/system.d/
+       $(CP) \
+               $(PKG_BUILD_DIR)/data/dbus/org.tichy.launcher.service \
+               $(1)//usr/share/dbus-1/system-services/
+
+       ## COMPONENTS
+       ## launcher (homescreen)
+       $(INSTALL_DIR) $(1)/usr/share/paroli/applications/paroli-launcher2
+       $(CP) \
+               $(PKG_BUILD_DIR)/paroli-applications/paroli-launcher2/*.{py,edj} \
+               $(1)/usr/share/paroli/applications/paroli-launcher2
+       # tele2 (dialer)
+       $(INSTALL_DIR) $(1)/usr/share/paroli/applications/tele2
+       $(CP) \
+               $(PKG_BUILD_DIR)/paroli-applications/tele2/*.{py,edj} \
+               $(1)/usr/share/paroli/applications/tele2
+       $(CP) \
+               $(PKG_BUILD_DIR)/data/tichy \
+               $(1)/usr/share/icons/paroli/tele.png
+       $(CP) \
+               ./files/desktop-files/tele.desktop \
+               $(1)/usr/share/applications/paroli/
+       ## msgs2 (messages)
+       #$(INSTALL_DIR) $(1)/usr/share/paroli/applications/msgs2
+       #$(CP) \
+       #       $(PKG_BUILD_DIR)/paroli-applications/msgs2/*.{py,edj} \
+       #       $(1)/usr/share/paroli/applications/msgs2
+       #$(CP) \
+       #       $(PKG_BUILD_DIR)/data/tichy \
+       #       $(1)/usr/share/icons/paroli/msgs.png
+       #$(CP) \
+       #       ./files/desktop-files/msgs.desktop \
+       #       $(1)/usr/share/applications/paroli/
+       ## people2 (contacts)
+       #$(INSTALL_DIR) $(1)/usr/share/paroli/applications/people2
+       #$(CP) \
+       #       $(PKG_BUILD_DIR)/paroli-applications/people2/*.{py,edj} \
+       #       $(1)/usr/share/paroli/applications/people2/
+       #$(CP) \
+       #       $(PKG_BUILD_DIR)/data/tichy \
+       #       $(1)/usr/share/icons/paroli/people.png
+       #$(CP) \
+       #       ./files/desktop-files/people.desktop \
+       #       $(1)/usr/share/applications/paroli/
+       ## i-o2 (incoming/outgoing)
+       #$(INSTALL_DIR) $(1)/usr/share/paroli/applications/i-o2
+       #$(CP) \
+       #       $(PKG_BUILD_DIR)/paroli-applications/i-o2/*.{py,edj} \
+       #       $(1)/usr/share/paroli/applications/i-o2/
+       #$(CP) \
+       #       $(PKG_BUILD_DIR)/data/tichy \
+       #       $(1)/usr/share/icons/paroli/i-o.png
+       #$(CP) \
+       #       ./files/desktop-files/i-o.desktop \
+       #       $(1)/usr/share/applications/paroli/
+
+       # SERVICES
+       $(CP) \
+               $(PKG_BUILD_DIR)/paroli-services/{dialog,hardware,phone,gprs,prefs,system} \
+               $(1)/usr/share/paroli/services/
 endef
 
 $(eval $(call BuildPackage,paroli))

diff --git a/phone/paroli/files/desktop-files/i-o.desktop b/phone/paroli/files/desktop-files/i-o.desktop
new file mode 100644 (file)
index 0000000..c9b947f
--- /dev/null
+++ b/phone/paroli/files/desktop-files/i-o.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+GenericName=I/O
+Name=I/O
+Encoding=UTF-8
+Version=1.0
+Comment=Paroli I/O
+StartupNotify=false
+Exec=dbus-send --system --print-reply --dest=org.tichy.launcher /Launcher org.tichy.Launcher.Launch string:Paroli-I/O
+Icon=/usr/share/icons/paroli/i-o.png
+Terminal=false
+Type=Application
+SingleInstance=true
+Categories=Telephony;TelephonyTools

diff --git a/phone/paroli/files/desktop-files/msgs.desktop b/phone/paroli/files/desktop-files/msgs.desktop
new file mode 100644 (file)
index 0000000..79f9b7a
--- /dev/null
+++ b/phone/paroli/files/desktop-files/msgs.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+GenericName=Messages
+Name=Messages
+Encoding=UTF-8
+Version=1.0
+Comment=Paroli Messages
+StartupNotify=false
+Exec=dbus-send --system --print-reply --dest=org.tichy.launcher /Launcher org.tichy.Launcher.Launch string:Paroli-Msgs
+Icon=/usr/share/icons/paroli/msgs.png
+Terminal=false
+Type=Application
+SingleInstance=true
+Categories=Telephony;TelephonyTools

diff --git a/phone/paroli/files/desktop-files/parolid.desktop b/phone/paroli/files/desktop-files/parolid.desktop
new file mode 100644 (file)
index 0000000..3a5d9ca
--- /dev/null
+++ b/phone/paroli/files/desktop-files/parolid.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+GenericName=Paroli
+Name=Paroli
+Encoding=UTF-8
+Version=1.0
+Comment=Paroli Daemon
+StartupNotify=false
+Exec=paroli
+Icon=/usr/share/icons/paroli/parolid.png
+Terminal=false
+Type=Application
+SingleInstance=true
+Categories=Telephony;TelephonyTools

diff --git a/phone/paroli/files/desktop-files/people.desktop b/phone/paroli/files/desktop-files/people.desktop
new file mode 100644 (file)
index 0000000..4e7bdc4
--- /dev/null
+++ b/phone/paroli/files/desktop-files/people.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+GenericName=People
+Name=People
+Encoding=UTF-8
+Version=1.0
+Comment=Paroli People
+StartupNotify=false
+Exec=dbus-send --system --print-reply --dest=org.tichy.launcher /Launcher org.tichy.Launcher.Launch string:Paroli-Contacts
+Icon=/usr/share/icons/paroli/people.png
+Terminal=false
+Type=Application
+SingleInstance=true
+Categories=Telephony;TelephonyTools

diff --git a/phone/paroli/files/desktop-files/tele.desktop b/phone/paroli/files/desktop-files/tele.desktop
new file mode 100644 (file)
index 0000000..31b04bb
--- /dev/null
+++ b/phone/paroli/files/desktop-files/tele.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+GenericName=Tele
+Name=Tele
+Encoding=UTF-8
+Version=1.0
+Comment=Paroli Tele
+StartupNotify=false
+Exec=dbus-send --system --print-reply --dest=org.tichy.launcher /Launcher org.tichy.Launcher.Launch string:Dialer
+Icon=/usr/share/icons/paroli/tele.png
+Terminal=false
+Type=Application
+SingleInstance=true
+Categories=Telephony;TelephonyTools

diff --git a/phone/paroli/files/paroli.cfg b/phone/paroli/files/paroli.cfg
index a9d30602ae534a8f19542805e21a9622bf977f30..fa4e4fb5de9fc0cd1744288b56e1046f8c6ac2b7 100644 (file)
--- a/phone/paroli/files/paroli.cfg
+++ b/phone/paroli/files/paroli.cfg
@@ -14,13 +14,19 @@ path = /usr/share/paroli/services:/usr/share/paroli/applications
 #defaults = GSM:Test, SIM:Test, Audio:Test,
 
 [autolaunch]
-application = 
+#application = Paroli-Launcher2
 
 [standalone]
-activated = 0
+activated = True
 
 [advanced-mode]
-activated = 1
+activated = True
 
 [dbus]
-activated = 1
+activated = True
+
+[settings]
+activated = True
+
+[error_messages]
+activated = True

diff --git a/phone/paroli/patches/051-disable-asserts.patch b/phone/paroli/patches/051-disable-asserts.patch
new file mode 100644 (file)
index 0000000..448b5b3
--- /dev/null
+++ b/phone/paroli/patches/051-disable-asserts.patch
@@ -0,0 +1,12 @@
+diff -ruN paroli-20090605.orig/paroli-core/tichy/settings.py paroli-20090605/paroli-core/tichy/settings.py
+--- paroli-20090605.orig/paroli-core/tichy/settings.py 2009-06-08 09:07:28.000000000 +0200
++++ paroli-20090605/paroli-core/tichy/settings.py      2009-06-10 15:27:15.000000000 +0200
+@@ -67,7 +67,7 @@
+                argument. The Setting value will actually be set
+                only after this tasklet returns.
+         """
+-        assert issubclass(type, Item), type
++        #assert issubclass(type, Item), type
+         self.group = group
+         self.name = name
+         self.type = type