Rename the module from olpc.datastore to carquinyol to make clearer that it's code private to the datastore

15 files changed, 19 insertions, 25 deletions

diff --git a/bin/datastore-service b/bin/datastore-service
index 850af9d..06b6517 100755
--- a/bin/datastore-service
+++ b/bin/datastore-service
@@ -4,7 +4,7 @@ import gobject
 import dbus.service
 import dbus.mainloop.glib
 import dbus.glib
-from olpc.datastore.datastore import DataStore
+from carquinyol.datastore import DataStore
 from sugar import logger
 
 # Path handling
diff --git a/configure.ac b/configure.ac
index d7260e5..951e16a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,5 @@ Makefile
 bin/Makefile
 etc/Makefile
 src/Makefile
-src/olpc/Makefile
-src/olpc/datastore/Makefile
+src/carquinyol/Makefile
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
index 2e5348c..434face 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1 +1 @@
-SUBDIRS = olpc
+SUBDIRS = carquinyol
diff --git a/src/olpc/datastore/Makefile.am b/src/carquinyol/Makefile.am
index 062e9b0..7c56174 100644
--- a/src/olpc/datastore/Makefile.am
+++ b/src/carquinyol/Makefile.am
@@ -1,4 +1,4 @@
-datastoredir = $(pythondir)/olpc/datastore
+datastoredir = $(pythondir)/carquinyol
 datastore_PYTHON = 		\
 	__init__.py		\
 	datastore.py		\
@@ -16,7 +16,7 @@ AM_CPPFLAGS = 			\
 
 AM_LDFLAGS = -module -avoid-version
 
-pkgpyexecdir = $(pythondir)/olpc/datastore
+pkgpyexecdir = $(pythondir)/carquinyol
 pkgpyexec_LTLIBRARIES = metadatareader.la
 
 metadatareader_la_SOURCES = 	\
diff --git a/src/olpc/datastore/__init__.py b/src/carquinyol/__init__.py
index 8b13789..8b13789 100644
--- a/src/olpc/datastore/__init__.py
+++ b/src/carquinyol/__init__.py
diff --git a/src/olpc/datastore/datastore.py b/src/carquinyol/datastore.py
index 0994b07..a118e03 100644
--- a/src/olpc/datastore/datastore.py
+++ b/src/carquinyol/datastore.py
@@ -26,13 +26,13 @@ import gobject
 
 from sugar import mime
 
-from olpc.datastore import layoutmanager
-from olpc.datastore import migration
-from olpc.datastore.layoutmanager import MAX_QUERY_LIMIT
-from olpc.datastore.metadatastore import MetadataStore
-from olpc.datastore.indexstore import IndexStore
-from olpc.datastore.filestore import FileStore
-from olpc.datastore.optimizer import Optimizer
+from carquinyol import layoutmanager
+from carquinyol import migration
+from carquinyol.layoutmanager import MAX_QUERY_LIMIT
+from carquinyol.metadatastore import MetadataStore
+from carquinyol.indexstore import IndexStore
+from carquinyol.filestore import FileStore
+from carquinyol.optimizer import Optimizer
 
 # the name used by the logger
 DS_LOG_CHANNEL = 'org.laptop.sugar.DataStore'
diff --git a/src/olpc/datastore/filestore.py b/src/carquinyol/filestore.py
index 471f713..f88c531 100644
--- a/src/olpc/datastore/filestore.py
+++ b/src/carquinyol/filestore.py
@@ -21,7 +21,7 @@ import tempfile
 
 import gobject
 
-from olpc.datastore import layoutmanager
+from carquinyol import layoutmanager
 
 class FileStore(object):
     """Handle the storage of one file per entry.
diff --git a/src/olpc/datastore/indexstore.py b/src/carquinyol/indexstore.py
index cf249d3..62aebb4 100644
--- a/src/olpc/datastore/indexstore.py
+++ b/src/carquinyol/indexstore.py
@@ -21,8 +21,8 @@ import gobject
 import xapian
 from xapian import WritableDatabase, Document, Enquire, Query, QueryParser
 
-from olpc.datastore import layoutmanager
-from olpc.datastore.layoutmanager import MAX_QUERY_LIMIT
+from carquinyol import layoutmanager
+from carquinyol.layoutmanager import MAX_QUERY_LIMIT
 
 _VALUE_UID = 0
 _VALUE_TIMESTAMP = 1
diff --git a/src/olpc/datastore/layoutmanager.py b/src/carquinyol/layoutmanager.py
index dc3fde6..dc3fde6 100644
--- a/src/olpc/datastore/layoutmanager.py
+++ b/src/carquinyol/layoutmanager.py
diff --git a/src/olpc/datastore/metadatareader.c b/src/carquinyol/metadatareader.c
index 08be17e..08be17e 100644
--- a/src/olpc/datastore/metadatareader.c
+++ b/src/carquinyol/metadatareader.c
diff --git a/src/olpc/datastore/metadatastore.py b/src/carquinyol/metadatastore.py
index ca194b9..50981f3 100644
--- a/src/olpc/datastore/metadatastore.py
+++ b/src/carquinyol/metadatastore.py
@@ -1,7 +1,7 @@
 import os
 
-from olpc.datastore import layoutmanager
-from olpc.datastore import metadatareader
+from carquinyol import layoutmanager
+from carquinyol import metadatareader
 
 MAX_SIZE = 256
 
diff --git a/src/olpc/datastore/migration.py b/src/carquinyol/migration.py
index 368b75d..228db2a 100644
--- a/src/olpc/datastore/migration.py
+++ b/src/carquinyol/migration.py
@@ -25,7 +25,7 @@ import traceback
 
 import cjson
 
-from olpc.datastore import layoutmanager
+from carquinyol import layoutmanager
 
 DATE_FORMAT = '%Y-%m-%dT%H:%M:%S'
 
diff --git a/src/olpc/datastore/optimizer.py b/src/carquinyol/optimizer.py
index 8bad683..f8a2e3e 100644
--- a/src/olpc/datastore/optimizer.py
+++ b/src/carquinyol/optimizer.py
@@ -21,7 +21,7 @@ import subprocess
 
 import gobject
 
-from olpc.datastore import layoutmanager
+from carquinyol import layoutmanager
 
 class Optimizer(object):
     """Optimizes disk space usage by detecting duplicates and sharing storage.
diff --git a/src/olpc/Makefile.am b/src/olpc/Makefile.am
deleted file mode 100644
index 9b2ae65..0000000
--- a/src/olpc/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS = datastore
-
-datastoredir = $(pythondir)/olpc
-datastore_PYTHON =	\
-	__init__.py
diff --git a/src/olpc/__init__.py b/src/olpc/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/src/olpc/__init__.py
+++ /dev/null