Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac2
-rw-r--r--services/Makefile.am1
-rw-r--r--services/presence/Activity.py (renamed from shell/PresenceService/Activity.py)0
-rw-r--r--services/presence/Buddy.py (renamed from shell/PresenceService/Buddy.py)0
-rw-r--r--services/presence/Makefile.am (renamed from shell/PresenceService/Makefile.am)6
-rw-r--r--services/presence/PresenceService.py (renamed from shell/PresenceService/PresenceService.py)0
-rw-r--r--services/presence/Service.py (renamed from shell/PresenceService/Service.py)0
-rw-r--r--services/presence/__init__.py (renamed from shell/PresenceService/__init__.py)0
-rw-r--r--services/presence/org.laptop.Presence.service.in (renamed from shell/PresenceService/org.laptop.Presence.service.in)0
-rwxr-xr-xservices/presence/sugar-presence-service (renamed from shell/sugar-presence-service)2
-rw-r--r--shell/Makefile.am5
-rw-r--r--sugar/__installed__.py.in3
-rw-r--r--sugar/__uninstalled__.py.in2
-rw-r--r--sugar/env.py3
16 files changed, 17 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index d0ca239..ffd6362 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,7 +38,7 @@ po/*.gmo
sugar/__installed__.py
sugar/__uninstalled__.py
tools/sugar-setup-activity
-shell/PresenceService/org.laptop.Presence.service
+services/presence/org.laptop.Presence.service
threadframe
config.guess
config.sub
diff --git a/Makefile.am b/Makefile.am
index 72ff820..323f1f4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = activities bindings po shell sugar tools
+SUBDIRS = activities bindings po shell sugar services tools
ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 52214dd..7d50fb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,7 @@ activities/terminal/Makefile
bindings/Makefile
bindings/globalkeys/Makefile
bindings/threadframe/Makefile
+services/Makefile
shell/Makefile
shell/conf/Makefile
shell/data/Makefile
@@ -52,7 +53,6 @@ shell/view/Makefile
shell/view/home/Makefile
shell/view/frame/Makefile
shell/model/Makefile
-shell/PresenceService/Makefile
sugar/Makefile
sugar/__installed__.py
sugar/__uninstalled__.py
diff --git a/services/Makefile.am b/services/Makefile.am
new file mode 100644
index 0000000..da40441
--- /dev/null
+++ b/services/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = presence
diff --git a/shell/PresenceService/Activity.py b/services/presence/Activity.py
index 6dc9497..6dc9497 100644
--- a/shell/PresenceService/Activity.py
+++ b/services/presence/Activity.py
diff --git a/shell/PresenceService/Buddy.py b/services/presence/Buddy.py
index 5d13c29..5d13c29 100644
--- a/shell/PresenceService/Buddy.py
+++ b/services/presence/Buddy.py
diff --git a/shell/PresenceService/Makefile.am b/services/presence/Makefile.am
index 1710d54..c095cb6 100644
--- a/shell/PresenceService/Makefile.am
+++ b/services/presence/Makefile.am
@@ -5,7 +5,7 @@ service_DATA = $(service_in_files:.service.in=.service)
$(service_DATA): $(service_in_files) Makefile
@sed -e "s|\@bindir\@|$(bindir)|" $< > $@
-sugardir = $(pkgdatadir)/shell/PresenceService
+sugardir = $(pkgdatadir)/services/presence
sugar_PYTHON = \
__init__.py \
Activity.py \
@@ -13,6 +13,8 @@ sugar_PYTHON = \
PresenceService.py \
Service.py
+bin_SCRIPTS = sugar-presence-service
+
DISTCLEANFILES = $(service_DATA)
-EXTRA_DIST = $(service_in_files)
+EXTRA_DIST = $(service_in_files) $(bin_SCRIPTS)
diff --git a/shell/PresenceService/PresenceService.py b/services/presence/PresenceService.py
index 1534ae9..1534ae9 100644
--- a/shell/PresenceService/PresenceService.py
+++ b/services/presence/PresenceService.py
diff --git a/shell/PresenceService/Service.py b/services/presence/Service.py
index 3c65d99..3c65d99 100644
--- a/shell/PresenceService/Service.py
+++ b/services/presence/Service.py
diff --git a/shell/PresenceService/__init__.py b/services/presence/__init__.py
index e69de29..e69de29 100644
--- a/shell/PresenceService/__init__.py
+++ b/services/presence/__init__.py
diff --git a/shell/PresenceService/org.laptop.Presence.service.in b/services/presence/org.laptop.Presence.service.in
index 3739d9e..3739d9e 100644
--- a/shell/PresenceService/org.laptop.Presence.service.in
+++ b/services/presence/org.laptop.Presence.service.in
diff --git a/shell/sugar-presence-service b/services/presence/sugar-presence-service
index fda0d12..88fd2e7 100755
--- a/shell/sugar-presence-service
+++ b/services/presence/sugar-presence-service
@@ -1,7 +1,7 @@
#!/usr/bin/python
import logging
-from PresenceService import PresenceService
+from presence import PresenceService
import sugar.logger
sugar.logger.start('PresenceService')
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 1bf373d..a4fd719 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,11 +1,10 @@
-SUBDIRS = conf data model view PresenceService
+SUBDIRS = conf data model view
bin_SCRIPTS = \
sugar \
sugar-activity \
sugar-activity-factory \
- sugar-console \
- sugar-presence-service
+ sugar-console
sugardir = $(pkgdatadir)/shell
sugar_PYTHON = \
diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in
index 5ebed29..fd1b855 100644
--- a/sugar/__installed__.py.in
+++ b/sugar/__installed__.py.in
@@ -6,5 +6,6 @@ sugar_dbus_config = '@prefix@/share/sugar/dbus-installed.conf'
sugar_python_path = ['@prefix@/share/sugar/shell',
'@prefix@/share/sugar/bindings',
- '@prefix@/share/sugar/activities']
+ '@prefix@/share/sugar/activities',
+ '@prefix@/share/sugar/services']
sugar_bin_path = []
diff --git a/sugar/__uninstalled__.py.in b/sugar/__uninstalled__.py.in
index 860cb21..02b43f1 100644
--- a/sugar/__uninstalled__.py.in
+++ b/sugar/__uninstalled__.py.in
@@ -14,6 +14,8 @@ sugar_python_path = ['@prefix@/share/sugar/bindings']
sugar_python_path.append(sugar_source_dir)
sugar_python_path.append(os.path.join(sugar_source_dir, 'shell'))
sugar_python_path.append(os.path.join(sugar_source_dir, 'activities'))
+sugar_python_path.append(os.path.join(sugar_source_dir, 'services'))
sugar_bin_path = []
sugar_bin_path.append(os.path.join(sugar_source_dir, 'shell'))
+sugar_bin_path.append(os.path.join(sugar_source_dir, 'services/presence'))
diff --git a/sugar/env.py b/sugar/env.py
index 8fc131a..b0c5443 100644
--- a/sugar/env.py
+++ b/sugar/env.py
@@ -43,7 +43,8 @@ def setup_system():
runner = os.path.join(sugar_source_dir, 'shell/sugar-activity-factory')
sugar.setup.setup_activities(source, sugar_activities_dir, runner)
- bin = os.path.join(sugar_source_dir, 'shell/sugar-presence-service')
+ bin = os.path.join(sugar_source_dir,
+ 'services/presence/sugar-presence-service')
sugar.setup.write_service('org.laptop.Presence', bin,
sugar_activities_dir)