r284 - in trunk/software/gsm0710muxd: data src

[smartphones-commits at lists.linuxtogo.org]

Author: mickeylauer
Date: 2008-04-29 16:47:43 +0200 (Tue, 29 Apr 2008)
New Revision: 284

Added:
   trunk/software/gsm0710muxd/data/org.pyneo.muxer.service.in
Removed:
   trunk/software/gsm0710muxd/data/org.freesmartphone.GSM.MUX.service.in
Modified:
   trunk/software/gsm0710muxd/data/Makefile.am
   trunk/software/gsm0710muxd/src/Makefile.am
Log:
gsm0710muxd: catch up with dbus bus renaming to org.pyneo.muxer, fix system service activation
(pending changing bus name in executable)


Modified: trunk/software/gsm0710muxd/data/Makefile.am
===================================================================
--- trunk/software/gsm0710muxd/data/Makefile.am	2008-04-29 13:20:03 UTC (rev 283)
+++ trunk/software/gsm0710muxd/data/Makefile.am	2008-04-29 14:47:43 UTC (rev 284)
@@ -1,11 +1,10 @@
-
 dbusdir = $(sysconfdir)/dbus-1/system.d
 
 dist_dbus_DATA = gsm0710muxd.conf
 
 servicedir = $(datadir)/dbus-1/system-services
 
-service_in_files = org.freesmartphone.GSM.MUX.service.in
+service_in_files = org.pyneo.muxer.service.in
 
 service_DATA = $(service_in_files:.service.in=.service)
 
@@ -16,4 +15,4 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 $(service_DATA): $(service_in_files)
-	@sed -e "s|\@bindir\@|$(bindir)|" $<> $@
+	@sed -e "s|\@sbindir\@|$(sbindir)|" $<> $@

Deleted: trunk/software/gsm0710muxd/data/org.freesmartphone.GSM.MUX.service.in
===================================================================
--- trunk/software/gsm0710muxd/data/org.freesmartphone.GSM.MUX.service.in	2008-04-29 13:20:03 UTC (rev 283)
+++ trunk/software/gsm0710muxd/data/org.freesmartphone.GSM.MUX.service.in	2008-04-29 14:47:43 UTC (rev 284)
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.freesmartphone.GSM.MUX
-Exec=@sbindir@/gsm0710muxd
-User=root

Copied: trunk/software/gsm0710muxd/data/org.pyneo.muxer.service.in (from rev 283, trunk/software/gsm0710muxd/data/org.freesmartphone.GSM.MUX.service.in)
===================================================================
--- trunk/software/gsm0710muxd/data/org.pyneo.muxer.service.in	                        (rev 0)
+++ trunk/software/gsm0710muxd/data/org.pyneo.muxer.service.in	2008-04-29 14:47:43 UTC (rev 284)
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.pyneo.muxer
+Exec=@sbindir@/gsm0710muxd
+User=root

Modified: trunk/software/gsm0710muxd/src/Makefile.am
===================================================================
--- trunk/software/gsm0710muxd/src/Makefile.am	2008-04-29 13:20:03 UTC (rev 283)
+++ trunk/software/gsm0710muxd/src/Makefile.am	2008-04-29 14:47:43 UTC (rev 284)
@@ -1,4 +1,3 @@
-
 sbin_PROGRAMS = gsm0710muxd
 
 gsm0710muxd_SOURCES = gsm0710muxd.c