Changeset 14165


Ignore:
Timestamp:
2009-01-24T02:52:00+01:00 (9 years ago)
Author:
mirko
Message:

modify Makefile to avoid patching the install paths, adjust desktop files, workaround some other crude bugs

Location:
feeds/phone/paroli
Files:
2 added
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • feeds/phone/paroli/Makefile

    r14007 r14165  
    99 
    1010PKG_NAME:=paroli 
    11 PKG_VERSION:=20090112 
    12 PKG_REV:=81db9c1a2abd7d56300867b04d4c541e34bb8165 
     11PKG_VERSION:=20090121 
     12PKG_REV:=9279b50ed72a94100d7f0f49090043134302f2eb 
    1313PKG_RELEASE:=2 
    1414 
     
    2828  CATEGORY:=Phone 
    2929  TITLE:=integrated phone application 
    30   DEPENDS:=python-core +fso 
     30  DEPENDS:=python-core +fso +python-evas +python-ecore +python-edje +python-e_dbus +python-etk 
    3131  URL:=http://wiki.openmoko.org/wiki/Paroli 
    3232endef 
     33 
     34COMPONENTS:= \ 
     35        paroli-dialer \ 
     36        paroli-contacts \ 
     37        paroli-i-o \ 
     38        paroli-msgs \ 
    3339 
    3440define Package/paroli/description 
     
    4248 
    4349define Package/paroli/install 
    44         $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) $(1)/usr/bin $(1)/etc/init.d $(1)/usr/share/applications/paroli $(1)/usr/share/paroli 
     50        $(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 
    4551        $(CP) \ 
    4652                $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ 
     
    5056                $(1)/usr/bin/ 
    5157        $(INSTALL_BIN) ./files/paroli.init $(1)/etc/init.d/paroli 
     58        $(foreach c, $(COMPONENTS), \ 
     59                $(INSTALL_DIR) $(1)/usr/share/paroli/applications/$(c) 
     60                $(CP) $(PKG_INSTALL_DIR)/../usr/share/paroli/applications/$(c)/$(c).{py,edj} $(1)/usr/share/paroli/applications/$(c)/ 
     61                $(CP) $(PKG_INSTALL_DIR)/../usr/share/paroli/applications/$(c)/icon.png $(1)/usr/share/icons/paroli/$(c).png 
     62        ) 
    5263        $(CP) \ 
    53                 $(PKG_INSTALL_DIR)/usr/paroli/* \ 
    54                 $(1)/usr/share/paroli/ 
     64                $(PKG_INSTALL_DIR)/../usr/share/paroli/services/* \ 
     65                $(1)/usr/share/paroli/services/ 
    5566        $(CP) \ 
    56                 $(PKG_INSTALL_DIR)/usr/applications/* \ 
     67                $(PKG_INSTALL_DIR)/../data/tichy \ 
     68                $(1)/usr/share/icons/paroli/tichy.png 
     69        $(CP) \ 
     70                $(PKG_INSTALL_DIR)/usr/applications/*.desktop \ 
    5771                $(1)/usr/share/applications/paroli/ 
    5872        $(CP) \ 
    59                 $(PKG_INSTALL_DIR)/etc/* \ 
     73                $(PKG_INSTALL_DIR)/usr/applications/paroli-launcher.desktop \ 
     74                $(1)/etc/xdg/autostart/ 
     75        $(CP) \ 
     76                $(PKG_INSTALL_DIR)/../etc/* \ 
    6077                $(1)/etc/ 
    6178endef 
  • feeds/phone/paroli/files/paroli.init

    r14042 r14165  
    44 
    55start() { 
    6     (sleep 10 && DISPLAY=":0" LD_PRELOAD=/usr/lib/libX11.so /usr/bin/paroli-launcher) & # sleep to wait until the xserver is started | LD_PRELOAD to workaround some runtime linking problems - needs to be fixed 
     6    (sleep 60 && DISPLAY=":0" LD_PRELOAD=/usr/lib/libX11.so /usr/bin/paroli-launcher) & # sleep to wait until the xserver is started | LD_PRELOAD to workaround some runtime linking problems - needs to be fixed 
    77} 
    88     
Note: See TracChangeset for help on using the changeset viewer.