diff --git a/Makefile.am b/Makefile.am index 4c2757d1..b62b8cc1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,4 +10,4 @@ EXTRA_DIST = \ intltool-update.in \ intltool-extract.in -SUBDIRS = po sugar +SUBDIRS = src po diff --git a/configure.ac b/configure.ac index a5bc1c61..9ed807f4 100644 --- a/configure.ac +++ b/configure.ac @@ -33,12 +33,13 @@ AM_GLIB_GNU_GETTEXT AC_OUTPUT([ Makefile -sugar/Makefile -sugar/activity/Makefile -sugar/bundle/Makefile -sugar/clipboard/Makefile -sugar/graphics/Makefile -sugar/presence/Makefile -sugar/datastore/Makefile +src/Makefile +src/sugar/Makefile +src/sugar/activity/Makefile +src/sugar/bundle/Makefile +src/sugar/clipboard/Makefile +src/sugar/graphics/Makefile +src/sugar/presence/Makefile +src/sugar/datastore/Makefile po/Makefile.in ]) diff --git a/sugar/.gitignore b/src/sugar/.gitignore similarity index 100% rename from sugar/.gitignore rename to src/sugar/.gitignore diff --git a/sugar/.license b/src/sugar/.license similarity index 100% rename from sugar/.license rename to src/sugar/.license diff --git a/sugar/Makefile.am b/src/sugar/Makefile.am similarity index 100% rename from sugar/Makefile.am rename to src/sugar/Makefile.am diff --git a/sugar/_sugarext.defs b/src/sugar/_sugarext.defs similarity index 100% rename from sugar/_sugarext.defs rename to src/sugar/_sugarext.defs diff --git a/sugar/_sugarext.override b/src/sugar/_sugarext.override similarity index 100% rename from sugar/_sugarext.override rename to src/sugar/_sugarext.override diff --git a/sugar/_sugarextmodule.c b/src/sugar/_sugarextmodule.c similarity index 100% rename from sugar/_sugarextmodule.c rename to src/sugar/_sugarextmodule.c diff --git a/sugar/activity/Makefile.am b/src/sugar/activity/Makefile.am similarity index 100% rename from sugar/activity/Makefile.am rename to src/sugar/activity/Makefile.am diff --git a/sugar/activity/__init__.py b/src/sugar/activity/__init__.py similarity index 100% rename from sugar/activity/__init__.py rename to src/sugar/activity/__init__.py diff --git a/sugar/activity/__init__py b/src/sugar/activity/__init__py similarity index 100% rename from sugar/activity/__init__py rename to src/sugar/activity/__init__py diff --git a/sugar/activity/activity.py b/src/sugar/activity/activity.py similarity index 100% rename from sugar/activity/activity.py rename to src/sugar/activity/activity.py diff --git a/sugar/activity/activityfactory.py b/src/sugar/activity/activityfactory.py similarity index 100% rename from sugar/activity/activityfactory.py rename to src/sugar/activity/activityfactory.py diff --git a/sugar/activity/activityhandle.py b/src/sugar/activity/activityhandle.py similarity index 100% rename from sugar/activity/activityhandle.py rename to src/sugar/activity/activityhandle.py diff --git a/sugar/activity/activityservice.py b/src/sugar/activity/activityservice.py similarity index 100% rename from sugar/activity/activityservice.py rename to src/sugar/activity/activityservice.py diff --git a/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuilder.py similarity index 100% rename from sugar/activity/bundlebuilder.py rename to src/sugar/activity/bundlebuilder.py diff --git a/sugar/activity/registry.py b/src/sugar/activity/registry.py similarity index 100% rename from sugar/activity/registry.py rename to src/sugar/activity/registry.py diff --git a/sugar/bundle/Makefile.am b/src/sugar/bundle/Makefile.am similarity index 100% rename from sugar/bundle/Makefile.am rename to src/sugar/bundle/Makefile.am diff --git a/sugar/bundle/__init__.py b/src/sugar/bundle/__init__.py similarity index 100% rename from sugar/bundle/__init__.py rename to src/sugar/bundle/__init__.py diff --git a/sugar/bundle/activitybundle.py b/src/sugar/bundle/activitybundle.py similarity index 100% rename from sugar/bundle/activitybundle.py rename to src/sugar/bundle/activitybundle.py diff --git a/sugar/bundle/bundle.py b/src/sugar/bundle/bundle.py similarity index 100% rename from sugar/bundle/bundle.py rename to src/sugar/bundle/bundle.py diff --git a/sugar/bundle/contentbundle.py b/src/sugar/bundle/contentbundle.py similarity index 100% rename from sugar/bundle/contentbundle.py rename to src/sugar/bundle/contentbundle.py diff --git a/sugar/clipboard/Makefile.am b/src/sugar/clipboard/Makefile.am similarity index 100% rename from sugar/clipboard/Makefile.am rename to src/sugar/clipboard/Makefile.am diff --git a/sugar/clipboard/__init__.py b/src/sugar/clipboard/__init__.py similarity index 100% rename from sugar/clipboard/__init__.py rename to src/sugar/clipboard/__init__.py diff --git a/sugar/clipboard/clipboardservice.py b/src/sugar/clipboard/clipboardservice.py similarity index 100% rename from sugar/clipboard/clipboardservice.py rename to src/sugar/clipboard/clipboardservice.py diff --git a/sugar/datastore/Makefile.am b/src/sugar/datastore/Makefile.am similarity index 100% rename from sugar/datastore/Makefile.am rename to src/sugar/datastore/Makefile.am diff --git a/sugar/datastore/__init__.py b/src/sugar/datastore/__init__.py similarity index 100% rename from sugar/datastore/__init__.py rename to src/sugar/datastore/__init__.py diff --git a/sugar/datastore/datastore.py b/src/sugar/datastore/datastore.py similarity index 100% rename from sugar/datastore/datastore.py rename to src/sugar/datastore/datastore.py diff --git a/sugar/datastore/dbus_helpers.py b/src/sugar/datastore/dbus_helpers.py similarity index 100% rename from sugar/datastore/dbus_helpers.py rename to src/sugar/datastore/dbus_helpers.py diff --git a/sugar/eggaccelerators.c b/src/sugar/eggaccelerators.c similarity index 100% rename from sugar/eggaccelerators.c rename to src/sugar/eggaccelerators.c diff --git a/sugar/eggaccelerators.h b/src/sugar/eggaccelerators.h similarity index 100% rename from sugar/eggaccelerators.h rename to src/sugar/eggaccelerators.h diff --git a/sugar/env.py b/src/sugar/env.py similarity index 100% rename from sugar/env.py rename to src/sugar/env.py diff --git a/sugar/graphics/Makefile.am b/src/sugar/graphics/Makefile.am similarity index 100% rename from sugar/graphics/Makefile.am rename to src/sugar/graphics/Makefile.am diff --git a/sugar/graphics/__init__.py b/src/sugar/graphics/__init__.py similarity index 100% rename from sugar/graphics/__init__.py rename to src/sugar/graphics/__init__.py diff --git a/sugar/graphics/alert.py b/src/sugar/graphics/alert.py similarity index 100% rename from sugar/graphics/alert.py rename to src/sugar/graphics/alert.py diff --git a/sugar/graphics/animator.py b/src/sugar/graphics/animator.py similarity index 100% rename from sugar/graphics/animator.py rename to src/sugar/graphics/animator.py diff --git a/sugar/graphics/combobox.py b/src/sugar/graphics/combobox.py similarity index 100% rename from sugar/graphics/combobox.py rename to src/sugar/graphics/combobox.py diff --git a/sugar/graphics/entry.py b/src/sugar/graphics/entry.py similarity index 100% rename from sugar/graphics/entry.py rename to src/sugar/graphics/entry.py diff --git a/sugar/graphics/icon.py b/src/sugar/graphics/icon.py similarity index 100% rename from sugar/graphics/icon.py rename to src/sugar/graphics/icon.py diff --git a/sugar/graphics/iconentry.py b/src/sugar/graphics/iconentry.py similarity index 100% rename from sugar/graphics/iconentry.py rename to src/sugar/graphics/iconentry.py diff --git a/sugar/graphics/menuitem.py b/src/sugar/graphics/menuitem.py similarity index 100% rename from sugar/graphics/menuitem.py rename to src/sugar/graphics/menuitem.py diff --git a/sugar/graphics/notebook.py b/src/sugar/graphics/notebook.py similarity index 100% rename from sugar/graphics/notebook.py rename to src/sugar/graphics/notebook.py diff --git a/sugar/graphics/objectchooser.py b/src/sugar/graphics/objectchooser.py similarity index 100% rename from sugar/graphics/objectchooser.py rename to src/sugar/graphics/objectchooser.py diff --git a/sugar/graphics/palette.py b/src/sugar/graphics/palette.py similarity index 100% rename from sugar/graphics/palette.py rename to src/sugar/graphics/palette.py diff --git a/sugar/graphics/palettegroup.py b/src/sugar/graphics/palettegroup.py similarity index 100% rename from sugar/graphics/palettegroup.py rename to src/sugar/graphics/palettegroup.py diff --git a/sugar/graphics/panel.py b/src/sugar/graphics/panel.py similarity index 100% rename from sugar/graphics/panel.py rename to src/sugar/graphics/panel.py diff --git a/sugar/graphics/radiotoolbutton.py b/src/sugar/graphics/radiotoolbutton.py similarity index 100% rename from sugar/graphics/radiotoolbutton.py rename to src/sugar/graphics/radiotoolbutton.py diff --git a/sugar/graphics/roundbox.py b/src/sugar/graphics/roundbox.py similarity index 100% rename from sugar/graphics/roundbox.py rename to src/sugar/graphics/roundbox.py diff --git a/sugar/graphics/style.py b/src/sugar/graphics/style.py similarity index 100% rename from sugar/graphics/style.py rename to src/sugar/graphics/style.py diff --git a/sugar/graphics/toggletoolbutton.py b/src/sugar/graphics/toggletoolbutton.py similarity index 100% rename from sugar/graphics/toggletoolbutton.py rename to src/sugar/graphics/toggletoolbutton.py diff --git a/sugar/graphics/toolbox.py b/src/sugar/graphics/toolbox.py similarity index 100% rename from sugar/graphics/toolbox.py rename to src/sugar/graphics/toolbox.py diff --git a/sugar/graphics/toolbutton.py b/src/sugar/graphics/toolbutton.py similarity index 100% rename from sugar/graphics/toolbutton.py rename to src/sugar/graphics/toolbutton.py diff --git a/sugar/graphics/toolcombobox.py b/src/sugar/graphics/toolcombobox.py similarity index 100% rename from sugar/graphics/toolcombobox.py rename to src/sugar/graphics/toolcombobox.py diff --git a/sugar/graphics/tray.py b/src/sugar/graphics/tray.py similarity index 100% rename from sugar/graphics/tray.py rename to src/sugar/graphics/tray.py diff --git a/sugar/graphics/window.py b/src/sugar/graphics/window.py similarity index 100% rename from sugar/graphics/window.py rename to src/sugar/graphics/window.py diff --git a/sugar/graphics/xocolor.py b/src/sugar/graphics/xocolor.py similarity index 100% rename from sugar/graphics/xocolor.py rename to src/sugar/graphics/xocolor.py diff --git a/sugar/network.py b/src/sugar/network.py similarity index 100% rename from sugar/network.py rename to src/sugar/network.py diff --git a/sugar/presence/Makefile.am b/src/sugar/presence/Makefile.am similarity index 100% rename from sugar/presence/Makefile.am rename to src/sugar/presence/Makefile.am diff --git a/sugar/presence/__init__.py b/src/sugar/presence/__init__.py similarity index 100% rename from sugar/presence/__init__.py rename to src/sugar/presence/__init__.py diff --git a/sugar/presence/activity.py b/src/sugar/presence/activity.py similarity index 100% rename from sugar/presence/activity.py rename to src/sugar/presence/activity.py diff --git a/sugar/presence/buddy.py b/src/sugar/presence/buddy.py similarity index 100% rename from sugar/presence/buddy.py rename to src/sugar/presence/buddy.py diff --git a/sugar/presence/presenceservice.py b/src/sugar/presence/presenceservice.py similarity index 100% rename from sugar/presence/presenceservice.py rename to src/sugar/presence/presenceservice.py diff --git a/sugar/presence/test_presence.txt b/src/sugar/presence/test_presence.txt similarity index 100% rename from sugar/presence/test_presence.txt rename to src/sugar/presence/test_presence.txt diff --git a/sugar/presence/tubeconn.py b/src/sugar/presence/tubeconn.py similarity index 100% rename from sugar/presence/tubeconn.py rename to src/sugar/presence/tubeconn.py diff --git a/sugar/profile.py b/src/sugar/profile.py similarity index 100% rename from sugar/profile.py rename to src/sugar/profile.py diff --git a/sugar/sexy-icon-entry.c b/src/sugar/sexy-icon-entry.c similarity index 100% rename from sugar/sexy-icon-entry.c rename to src/sugar/sexy-icon-entry.c diff --git a/sugar/sexy-icon-entry.h b/src/sugar/sexy-icon-entry.h similarity index 100% rename from sugar/sexy-icon-entry.h rename to src/sugar/sexy-icon-entry.h diff --git a/sugar/sugar-address-entry.c b/src/sugar/sugar-address-entry.c similarity index 100% rename from sugar/sugar-address-entry.c rename to src/sugar/sugar-address-entry.c diff --git a/sugar/sugar-address-entry.h b/src/sugar/sugar-address-entry.h similarity index 100% rename from sugar/sugar-address-entry.h rename to src/sugar/sugar-address-entry.h diff --git a/sugar/sugar-key-grabber.c b/src/sugar/sugar-key-grabber.c similarity index 100% rename from sugar/sugar-key-grabber.c rename to src/sugar/sugar-key-grabber.c diff --git a/sugar/sugar-key-grabber.h b/src/sugar/sugar-key-grabber.h similarity index 100% rename from sugar/sugar-key-grabber.h rename to src/sugar/sugar-key-grabber.h diff --git a/sugar/sugar-marshal.list b/src/sugar/sugar-marshal.list similarity index 100% rename from sugar/sugar-marshal.list rename to src/sugar/sugar-marshal.list diff --git a/sugar/sugar-menu.c b/src/sugar/sugar-menu.c similarity index 100% rename from sugar/sugar-menu.c rename to src/sugar/sugar-menu.c diff --git a/sugar/sugar-menu.h b/src/sugar/sugar-menu.h similarity index 100% rename from sugar/sugar-menu.h rename to src/sugar/sugar-menu.h diff --git a/sugar/sugar-preview.c b/src/sugar/sugar-preview.c similarity index 100% rename from sugar/sugar-preview.c rename to src/sugar/sugar-preview.c diff --git a/sugar/sugar-preview.h b/src/sugar/sugar-preview.h similarity index 100% rename from sugar/sugar-preview.h rename to src/sugar/sugar-preview.h diff --git a/sugar/util.py b/src/sugar/util.py similarity index 100% rename from sugar/util.py rename to src/sugar/util.py diff --git a/sugar/wm.py b/src/sugar/wm.py similarity index 100% rename from sugar/wm.py rename to src/sugar/wm.py