From 2ae1b84f540554bcbe033c85d092c239a6fefef0 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@byu.net>
Date: Tue, 29 Dec 2009 12:01:49 -0600
Subject: [PATCH] It seems all of the other connection managers are stored in
 telepathy's lib dir, so moving mine over to there

---
 Makefile                                           |    2 +-
 src/telepathy-theonering                           |    3 +++
 support/builddeb.py                                |    1 +
 ....Telepathy.ConnectionManager.theonering.service |    2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index bfacab9..fcb92a2 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ package: $(OBJ)
 	cp $(SOURCE_PATH)/constants.py  $(BUILD_PATH)/generic
 	$(foreach file, $(DATA), cp $(file) $(BUILD_PATH)/generic/$(subst /,!,$(file)) ; )
 	$(foreach file, $(SOURCE), cp $(file) $(BUILD_PATH)/generic/$(subst /,!,$(file)) ; )
-	cp $(SOURCE_PATH)/telepathy-theonering $(BUILD_PATH)/generic/$(subst /,!,$(SOURCE_PATH)/telepathy-theonering)
+	cp $(SOURCE_PATH)/telepathy-theonering $(BUILD_PATH)/generic/
 	cp support/$(PROJECT_NAME).manager $(BUILD_PATH)/generic
 	cp support/$(PROJECT_NAME).profile.* $(BUILD_PATH)/generic
 	cp support/org.freedesktop.Telepathy.ConnectionManager.$(PROJECT_NAME).service $(BUILD_PATH)/generic
diff --git a/src/telepathy-theonering b/src/telepathy-theonering
index b18e407..baf7dae 100755
--- a/src/telepathy-theonering
+++ b/src/telepathy-theonering
@@ -1,5 +1,8 @@
 #!/usr/bin/python
 
+import sys
+sys.path.insert(0, "/usr/lib/theonering")
+
 
 import theonering
 
diff --git a/support/builddeb.py b/support/builddeb.py
index 133446e..589e9b3 100755
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -113,6 +113,7 @@ def build_package(distribution):
 		p["/usr/share/mission-control/profiles"] = ["theonering.profile.%s|theonering.profile"% distribution]
 	elif distribution in ("diablo", "fremantle", "mer"):
 		p["/usr/share/osso-rtcom"] = ["theonering.profile.%s|theonering.profile"% distribution]
+	p["/usr/lib/telepathy"] = ["telepathy-theonering"]
 	p["/usr/share/telepathy/managers"] = ["theonering.manager"]
 	p["/usr/share/icons/hicolor/26x26/hildon"] = ["26x26-theonering.png|theonering.png"]
 	p["/usr/share/icons/hicolor/64x64/hildon"] = ["64x64-theonering.png|theonering.png"]
diff --git a/support/org.freedesktop.Telepathy.ConnectionManager.theonering.service b/support/org.freedesktop.Telepathy.ConnectionManager.theonering.service
index e868378..30a8862 100644
--- a/support/org.freedesktop.Telepathy.ConnectionManager.theonering.service
+++ b/support/org.freedesktop.Telepathy.ConnectionManager.theonering.service
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.Telepathy.ConnectionManager.theonering
-Exec=@LIBEXECDIR@/telepathy-theonering
+Exec=/usr/lib/telepathy/telepathy-theonering
-- 
1.7.9.5