From: Mirko Vogt <mirko@openwrt.org>
Date: Sun, 5 Jul 2009 11:32:21 +0000 (+0000)
Subject: - upgrade paroli to recent git version - enable previously disabled modules <contacts... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a183bea1419ad63955039634aacf39558321d651;p=openwrt%2Fsvn-archive%2Ffeeds.git

- upgrade paroli to recent git version - enable previously disabled modules <contacts>, <i/o>, <messages>, since the elementary problem which caused them not to work is fixed in #16667 - use relative paths for icon files as illume is able to handle them since #16634

SVN-Revision: 16684
---

diff --git a/phone/paroli/Makefile b/phone/paroli/Makefile
index 44e43fc..001440e 100644
--- a/phone/paroli/Makefile
+++ b/phone/paroli/Makefile
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=paroli
-PKG_VERSION:=20090605
-PKG_REV:=120c1aca795fd28b50e361eb908786ed25f98253
+PKG_VERSION:=20090704
+PKG_REV:=71fd25f3613c2376b980cfdd58cfee504b891e92
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -45,7 +45,7 @@ define Package/paroli/install
 		$(1)/usr/bin \
 		$(1)/usr/share/applications/paroli \
 		$(1)/usr/share/paroli/services \
-		$(1)/usr/share/icons/paroli \
+		$(1)/usr/share/icons \
         $(1)/usr/share/elementary/themes \
         $(1)/usr/share/dbus-1/system-services \
         $(1)/etc/dbus-1/system.d \
@@ -61,7 +61,7 @@ define Package/paroli/install
 		$(1)/usr/bin/
 	$(CP) \
 		$(PKG_BUILD_DIR)/data/tichy \
-		$(1)/usr/share/icons/paroli/parolid.png
+		$(1)/usr/share/icons/parolid.png
 	$(CP) \
 		./files/desktop-files/parolid.desktop \
 		$(1)/etc/xdg/autostart/
@@ -91,43 +91,43 @@ define Package/paroli/install
 		$(1)/usr/share/paroli/applications/tele2
 	$(CP) \
 		$(PKG_BUILD_DIR)/data/tichy \
-		$(1)/usr/share/icons/paroli/tele.png
+		$(1)/usr/share/icons/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/
+	# 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/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/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/i-o.png
+	$(CP) \
+		./files/desktop-files/i-o.desktop \
+		$(1)/usr/share/applications/paroli/
 
 	# SERVICES
 	$(CP) \
diff --git a/phone/paroli/files/desktop-files/i-o.desktop b/phone/paroli/files/desktop-files/i-o.desktop
index e649dbf..b6f673b 100644
--- a/phone/paroli/files/desktop-files/i-o.desktop
+++ b/phone/paroli/files/desktop-files/i-o.desktop
@@ -6,7 +6,7 @@ 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:Call-Log
-Icon=/usr/share/icons/paroli/i-o.png
+Icon=i-o
 Terminal=false
 Type=Application
 SingleInstance=true
diff --git a/phone/paroli/files/desktop-files/msgs.desktop b/phone/paroli/files/desktop-files/msgs.desktop
index fd2040e..fc0e2a1 100644
--- a/phone/paroli/files/desktop-files/msgs.desktop
+++ b/phone/paroli/files/desktop-files/msgs.desktop
@@ -6,7 +6,7 @@ Version=1.0
 Comment=Paroli Messages
 StartupNotify=false
 Exec=dbus-send --system --print-reply --dest=org.tichy.launcher /Launcher org.tichy.Launcher.Launch string:SMS
-Icon=/usr/share/icons/paroli/msgs.png
+Icon=msgs
 Terminal=false
 Type=Application
 SingleInstance=true
diff --git a/phone/paroli/files/desktop-files/parolid.desktop b/phone/paroli/files/desktop-files/parolid.desktop
index 3a5d9ca..28bd794 100644
--- a/phone/paroli/files/desktop-files/parolid.desktop
+++ b/phone/paroli/files/desktop-files/parolid.desktop
@@ -6,7 +6,7 @@ Version=1.0
 Comment=Paroli Daemon
 StartupNotify=false
 Exec=paroli
-Icon=/usr/share/icons/paroli/parolid.png
+Icon=parolid
 Terminal=false
 Type=Application
 SingleInstance=true
diff --git a/phone/paroli/files/desktop-files/people.desktop b/phone/paroli/files/desktop-files/people.desktop
index 3f0a5bd..fe2b6e5 100644
--- a/phone/paroli/files/desktop-files/people.desktop
+++ b/phone/paroli/files/desktop-files/people.desktop
@@ -6,7 +6,7 @@ Version=1.0
 Comment=Paroli People
 StartupNotify=false
 Exec=dbus-send --system --print-reply --dest=org.tichy.launcher /Launcher org.tichy.Launcher.Launch string:People
-Icon=/usr/share/icons/paroli/people.png
+Icon=people
 Terminal=false
 Type=Application
 SingleInstance=true
diff --git a/phone/paroli/files/desktop-files/tele.desktop b/phone/paroli/files/desktop-files/tele.desktop
index 31b04bb..b23bffd 100644
--- a/phone/paroli/files/desktop-files/tele.desktop
+++ b/phone/paroli/files/desktop-files/tele.desktop
@@ -6,7 +6,7 @@ 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
+Icon=tele
 Terminal=false
 Type=Application
 SingleInstance=true