diff --git a/configure.ac b/configure.ac index 1c84fa57..a12f0719 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([sugar-toolkit],[0.95.1],[],[sugar-toolkit]) +AC_INIT([sugar-toolkit-gtk3],[0.95.1],[],[sugar-toolkit-gtk3]) AC_PREREQ([2.59]) @@ -38,11 +38,11 @@ AM_GLIB_GNU_GETTEXT AC_OUTPUT([ Makefile src/Makefile -src/sugar/Makefile -src/sugar/activity/Makefile -src/sugar/bundle/Makefile -src/sugar/graphics/Makefile -src/sugar/presence/Makefile -src/sugar/datastore/Makefile +src/sugar3/Makefile +src/sugar3/activity/Makefile +src/sugar3/bundle/Makefile +src/sugar3/graphics/Makefile +src/sugar3/presence/Makefile +src/sugar3/datastore/Makefile po/Makefile.in ]) diff --git a/po/POTFILES.in b/po/POTFILES.in index c9a84435..ffbaa648 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,7 @@ -src/sugar/activity/activity.py -src/sugar/activity/namingalert.py -src/sugar/activity/widgets.py -src/sugar/graphics/alert.py -src/sugar/graphics/colorbutton.py -src/sugar/graphics/objectchooser.py -src/sugar/util.py +src/sugar3/activity/activity.py +src/sugar3/activity/namingalert.py +src/sugar3/activity/widgets.py +src/sugar3/graphics/alert.py +src/sugar3/graphics/colorbutton.py +src/sugar3/graphics/objectchooser.py +src/sugar3/util.py diff --git a/po/POTFILES.skip b/po/POTFILES.skip index a656b5a9..8dd3dfef 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1,6 +1,6 @@ # We don't care about these string, they are in code which we don't really # use and is there solely to not diverge too much from the "upstream" # versions of these files. -src/sugar/eggdesktopfile.c -src/sugar/eggsmclient.c -src/sugar/gsm-xsmp.c +src/sugar3/eggdesktopfile.c +src/sugar3/eggsmclient.c +src/sugar3/gsm-xsmp.c diff --git a/src/Makefile.am b/src/Makefile.am index 4fa44db3..8bfdc005 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1 +1 @@ -SUBDIRS = sugar +SUBDIRS = sugar3 diff --git a/src/sugar/.gitignore b/src/sugar3/.gitignore similarity index 100% rename from src/sugar/.gitignore rename to src/sugar3/.gitignore diff --git a/src/sugar/.license b/src/sugar3/.license similarity index 100% rename from src/sugar/.license rename to src/sugar3/.license diff --git a/src/sugar/Makefile.am b/src/sugar3/Makefile.am similarity index 96% rename from src/sugar/Makefile.am rename to src/sugar3/Makefile.am index c1ff933e..a66b7413 100644 --- a/src/sugar/Makefile.am +++ b/src/sugar3/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = activity bundle graphics presence datastore -sugardir = $(pythondir)/sugar +sugardir = $(pythondir)/sugar3 sugar_PYTHON = \ env.py \ network.py \ @@ -9,7 +9,7 @@ sugar_PYTHON = \ util.py \ wm.py -pkgpyexecdir = $(pythondir)/sugar +pkgpyexecdir = $(pythondir)/sugar3 pkgpyexec_LTLIBRARIES = _sugarext.la diff --git a/src/sugar/_sugarext.defs b/src/sugar3/_sugarext.defs similarity index 100% rename from src/sugar/_sugarext.defs rename to src/sugar3/_sugarext.defs diff --git a/src/sugar/_sugarext.override b/src/sugar3/_sugarext.override similarity index 100% rename from src/sugar/_sugarext.override rename to src/sugar3/_sugarext.override diff --git a/src/sugar/_sugarextmodule.c b/src/sugar3/_sugarextmodule.c similarity index 100% rename from src/sugar/_sugarextmodule.c rename to src/sugar3/_sugarextmodule.c diff --git a/src/sugar/acme-volume-alsa.c b/src/sugar3/acme-volume-alsa.c similarity index 100% rename from src/sugar/acme-volume-alsa.c rename to src/sugar3/acme-volume-alsa.c diff --git a/src/sugar/acme-volume-alsa.h b/src/sugar3/acme-volume-alsa.h similarity index 100% rename from src/sugar/acme-volume-alsa.h rename to src/sugar3/acme-volume-alsa.h diff --git a/src/sugar/acme-volume.c b/src/sugar3/acme-volume.c similarity index 100% rename from src/sugar/acme-volume.c rename to src/sugar3/acme-volume.c diff --git a/src/sugar/acme-volume.h b/src/sugar3/acme-volume.h similarity index 100% rename from src/sugar/acme-volume.h rename to src/sugar3/acme-volume.h diff --git a/src/sugar/activity/Makefile.am b/src/sugar3/activity/Makefile.am similarity index 87% rename from src/sugar/activity/Makefile.am rename to src/sugar3/activity/Makefile.am index 2c2eff18..50e12a5d 100644 --- a/src/sugar/activity/Makefile.am +++ b/src/sugar3/activity/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pythondir)/sugar/activity +sugardir = $(pythondir)/sugar3/activity sugar_PYTHON = \ __init__.py \ activity.py \ diff --git a/src/sugar/activity/__init__.py b/src/sugar3/activity/__init__.py similarity index 100% rename from src/sugar/activity/__init__.py rename to src/sugar3/activity/__init__.py diff --git a/src/sugar/activity/activity.py b/src/sugar3/activity/activity.py similarity index 100% rename from src/sugar/activity/activity.py rename to src/sugar3/activity/activity.py diff --git a/src/sugar/activity/activityfactory.py b/src/sugar3/activity/activityfactory.py similarity index 100% rename from src/sugar/activity/activityfactory.py rename to src/sugar3/activity/activityfactory.py diff --git a/src/sugar/activity/activityhandle.py b/src/sugar3/activity/activityhandle.py similarity index 100% rename from src/sugar/activity/activityhandle.py rename to src/sugar3/activity/activityhandle.py diff --git a/src/sugar/activity/activityservice.py b/src/sugar3/activity/activityservice.py similarity index 100% rename from src/sugar/activity/activityservice.py rename to src/sugar3/activity/activityservice.py diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar3/activity/bundlebuilder.py similarity index 100% rename from src/sugar/activity/bundlebuilder.py rename to src/sugar3/activity/bundlebuilder.py diff --git a/src/sugar/activity/i18n.py b/src/sugar3/activity/i18n.py similarity index 100% rename from src/sugar/activity/i18n.py rename to src/sugar3/activity/i18n.py diff --git a/src/sugar/activity/main.py b/src/sugar3/activity/main.py similarity index 100% rename from src/sugar/activity/main.py rename to src/sugar3/activity/main.py diff --git a/src/sugar/activity/namingalert.py b/src/sugar3/activity/namingalert.py similarity index 100% rename from src/sugar/activity/namingalert.py rename to src/sugar3/activity/namingalert.py diff --git a/src/sugar/activity/widgets.py b/src/sugar3/activity/widgets.py similarity index 100% rename from src/sugar/activity/widgets.py rename to src/sugar3/activity/widgets.py diff --git a/src/sugar/bundle/Makefile.am b/src/sugar3/bundle/Makefile.am similarity index 74% rename from src/sugar/bundle/Makefile.am rename to src/sugar3/bundle/Makefile.am index 50c93de2..50b56812 100644 --- a/src/sugar/bundle/Makefile.am +++ b/src/sugar3/bundle/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pythondir)/sugar/bundle +sugardir = $(pythondir)/sugar3/bundle sugar_PYTHON = \ __init__.py \ bundle.py \ diff --git a/src/sugar/bundle/__init__.py b/src/sugar3/bundle/__init__.py similarity index 100% rename from src/sugar/bundle/__init__.py rename to src/sugar3/bundle/__init__.py diff --git a/src/sugar/bundle/activitybundle.py b/src/sugar3/bundle/activitybundle.py similarity index 100% rename from src/sugar/bundle/activitybundle.py rename to src/sugar3/bundle/activitybundle.py diff --git a/src/sugar/bundle/bundle.py b/src/sugar3/bundle/bundle.py similarity index 100% rename from src/sugar/bundle/bundle.py rename to src/sugar3/bundle/bundle.py diff --git a/src/sugar/bundle/bundleversion.py b/src/sugar3/bundle/bundleversion.py similarity index 100% rename from src/sugar/bundle/bundleversion.py rename to src/sugar3/bundle/bundleversion.py diff --git a/src/sugar/bundle/contentbundle.py b/src/sugar3/bundle/contentbundle.py similarity index 100% rename from src/sugar/bundle/contentbundle.py rename to src/sugar3/bundle/contentbundle.py diff --git a/src/sugar/datastore/Makefile.am b/src/sugar3/datastore/Makefile.am similarity index 53% rename from src/sugar/datastore/Makefile.am rename to src/sugar3/datastore/Makefile.am index 81d760ce..63a11366 100644 --- a/src/sugar/datastore/Makefile.am +++ b/src/sugar3/datastore/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pythondir)/sugar/datastore +sugardir = $(pythondir)/sugar3/datastore sugar_PYTHON = \ __init__.py \ datastore.py diff --git a/src/sugar/datastore/__init__.py b/src/sugar3/datastore/__init__.py similarity index 100% rename from src/sugar/datastore/__init__.py rename to src/sugar3/datastore/__init__.py diff --git a/src/sugar/datastore/datastore.py b/src/sugar3/datastore/datastore.py similarity index 100% rename from src/sugar/datastore/datastore.py rename to src/sugar3/datastore/datastore.py diff --git a/src/sugar/eggaccelerators.c b/src/sugar3/eggaccelerators.c similarity index 100% rename from src/sugar/eggaccelerators.c rename to src/sugar3/eggaccelerators.c diff --git a/src/sugar/eggaccelerators.h b/src/sugar3/eggaccelerators.h similarity index 100% rename from src/sugar/eggaccelerators.h rename to src/sugar3/eggaccelerators.h diff --git a/src/sugar/eggdesktopfile.c b/src/sugar3/eggdesktopfile.c similarity index 100% rename from src/sugar/eggdesktopfile.c rename to src/sugar3/eggdesktopfile.c diff --git a/src/sugar/eggdesktopfile.h b/src/sugar3/eggdesktopfile.h similarity index 100% rename from src/sugar/eggdesktopfile.h rename to src/sugar3/eggdesktopfile.h diff --git a/src/sugar/eggsmclient-private.h b/src/sugar3/eggsmclient-private.h similarity index 100% rename from src/sugar/eggsmclient-private.h rename to src/sugar3/eggsmclient-private.h diff --git a/src/sugar/eggsmclient-xsmp.c b/src/sugar3/eggsmclient-xsmp.c similarity index 100% rename from src/sugar/eggsmclient-xsmp.c rename to src/sugar3/eggsmclient-xsmp.c diff --git a/src/sugar/eggsmclient.c b/src/sugar3/eggsmclient.c similarity index 100% rename from src/sugar/eggsmclient.c rename to src/sugar3/eggsmclient.c diff --git a/src/sugar/eggsmclient.h b/src/sugar3/eggsmclient.h similarity index 100% rename from src/sugar/eggsmclient.h rename to src/sugar3/eggsmclient.h diff --git a/src/sugar/env.py b/src/sugar3/env.py similarity index 100% rename from src/sugar/env.py rename to src/sugar3/env.py diff --git a/src/sugar/graphics/Makefile.am b/src/sugar3/graphics/Makefile.am similarity index 95% rename from src/sugar/graphics/Makefile.am rename to src/sugar3/graphics/Makefile.am index 73342883..a4bc0b0f 100644 --- a/src/sugar/graphics/Makefile.am +++ b/src/sugar3/graphics/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pythondir)/sugar/graphics +sugardir = $(pythondir)/sugar3/graphics sugar_PYTHON = \ alert.py \ animator.py \ diff --git a/src/sugar/graphics/__init__.py b/src/sugar3/graphics/__init__.py similarity index 100% rename from src/sugar/graphics/__init__.py rename to src/sugar3/graphics/__init__.py diff --git a/src/sugar/graphics/alert.py b/src/sugar3/graphics/alert.py similarity index 100% rename from src/sugar/graphics/alert.py rename to src/sugar3/graphics/alert.py diff --git a/src/sugar/graphics/animator.py b/src/sugar3/graphics/animator.py similarity index 100% rename from src/sugar/graphics/animator.py rename to src/sugar3/graphics/animator.py diff --git a/src/sugar/graphics/canvastextview.py b/src/sugar3/graphics/canvastextview.py similarity index 100% rename from src/sugar/graphics/canvastextview.py rename to src/sugar3/graphics/canvastextview.py diff --git a/src/sugar/graphics/colorbutton.py b/src/sugar3/graphics/colorbutton.py similarity index 100% rename from src/sugar/graphics/colorbutton.py rename to src/sugar3/graphics/colorbutton.py diff --git a/src/sugar/graphics/combobox.py b/src/sugar3/graphics/combobox.py similarity index 100% rename from src/sugar/graphics/combobox.py rename to src/sugar3/graphics/combobox.py diff --git a/src/sugar/graphics/entry.py b/src/sugar3/graphics/entry.py similarity index 100% rename from src/sugar/graphics/entry.py rename to src/sugar3/graphics/entry.py diff --git a/src/sugar/graphics/icon.py b/src/sugar3/graphics/icon.py similarity index 100% rename from src/sugar/graphics/icon.py rename to src/sugar3/graphics/icon.py diff --git a/src/sugar/graphics/iconentry.py b/src/sugar3/graphics/iconentry.py similarity index 100% rename from src/sugar/graphics/iconentry.py rename to src/sugar3/graphics/iconentry.py diff --git a/src/sugar/graphics/menuitem.py b/src/sugar3/graphics/menuitem.py similarity index 100% rename from src/sugar/graphics/menuitem.py rename to src/sugar3/graphics/menuitem.py diff --git a/src/sugar/graphics/notebook.py b/src/sugar3/graphics/notebook.py similarity index 100% rename from src/sugar/graphics/notebook.py rename to src/sugar3/graphics/notebook.py diff --git a/src/sugar/graphics/objectchooser.py b/src/sugar3/graphics/objectchooser.py similarity index 100% rename from src/sugar/graphics/objectchooser.py rename to src/sugar3/graphics/objectchooser.py diff --git a/src/sugar/graphics/palette.py b/src/sugar3/graphics/palette.py similarity index 100% rename from src/sugar/graphics/palette.py rename to src/sugar3/graphics/palette.py diff --git a/src/sugar/graphics/palettegroup.py b/src/sugar3/graphics/palettegroup.py similarity index 100% rename from src/sugar/graphics/palettegroup.py rename to src/sugar3/graphics/palettegroup.py diff --git a/src/sugar/graphics/palettewindow.py b/src/sugar3/graphics/palettewindow.py similarity index 100% rename from src/sugar/graphics/palettewindow.py rename to src/sugar3/graphics/palettewindow.py diff --git a/src/sugar/graphics/panel.py b/src/sugar3/graphics/panel.py similarity index 100% rename from src/sugar/graphics/panel.py rename to src/sugar3/graphics/panel.py diff --git a/src/sugar/graphics/radiopalette.py b/src/sugar3/graphics/radiopalette.py similarity index 100% rename from src/sugar/graphics/radiopalette.py rename to src/sugar3/graphics/radiopalette.py diff --git a/src/sugar/graphics/radiotoolbutton.py b/src/sugar3/graphics/radiotoolbutton.py similarity index 100% rename from src/sugar/graphics/radiotoolbutton.py rename to src/sugar3/graphics/radiotoolbutton.py diff --git a/src/sugar/graphics/roundbox.py b/src/sugar3/graphics/roundbox.py similarity index 100% rename from src/sugar/graphics/roundbox.py rename to src/sugar3/graphics/roundbox.py diff --git a/src/sugar/graphics/style.py b/src/sugar3/graphics/style.py similarity index 100% rename from src/sugar/graphics/style.py rename to src/sugar3/graphics/style.py diff --git a/src/sugar/graphics/toggletoolbutton.py b/src/sugar3/graphics/toggletoolbutton.py similarity index 100% rename from src/sugar/graphics/toggletoolbutton.py rename to src/sugar3/graphics/toggletoolbutton.py diff --git a/src/sugar/graphics/toolbarbox.py b/src/sugar3/graphics/toolbarbox.py similarity index 100% rename from src/sugar/graphics/toolbarbox.py rename to src/sugar3/graphics/toolbarbox.py diff --git a/src/sugar/graphics/toolbox.py b/src/sugar3/graphics/toolbox.py similarity index 100% rename from src/sugar/graphics/toolbox.py rename to src/sugar3/graphics/toolbox.py diff --git a/src/sugar/graphics/toolbutton.py b/src/sugar3/graphics/toolbutton.py similarity index 100% rename from src/sugar/graphics/toolbutton.py rename to src/sugar3/graphics/toolbutton.py diff --git a/src/sugar/graphics/toolcombobox.py b/src/sugar3/graphics/toolcombobox.py similarity index 100% rename from src/sugar/graphics/toolcombobox.py rename to src/sugar3/graphics/toolcombobox.py diff --git a/src/sugar/graphics/tray.py b/src/sugar3/graphics/tray.py similarity index 100% rename from src/sugar/graphics/tray.py rename to src/sugar3/graphics/tray.py diff --git a/src/sugar/graphics/window.py b/src/sugar3/graphics/window.py similarity index 100% rename from src/sugar/graphics/window.py rename to src/sugar3/graphics/window.py diff --git a/src/sugar/graphics/xocolor.py b/src/sugar3/graphics/xocolor.py similarity index 100% rename from src/sugar/graphics/xocolor.py rename to src/sugar3/graphics/xocolor.py diff --git a/src/sugar/gsm-app.c b/src/sugar3/gsm-app.c similarity index 100% rename from src/sugar/gsm-app.c rename to src/sugar3/gsm-app.c diff --git a/src/sugar/gsm-app.h b/src/sugar3/gsm-app.h similarity index 100% rename from src/sugar/gsm-app.h rename to src/sugar3/gsm-app.h diff --git a/src/sugar/gsm-client-xsmp.c b/src/sugar3/gsm-client-xsmp.c similarity index 100% rename from src/sugar/gsm-client-xsmp.c rename to src/sugar3/gsm-client-xsmp.c diff --git a/src/sugar/gsm-client-xsmp.h b/src/sugar3/gsm-client-xsmp.h similarity index 100% rename from src/sugar/gsm-client-xsmp.h rename to src/sugar3/gsm-client-xsmp.h diff --git a/src/sugar/gsm-client.c b/src/sugar3/gsm-client.c similarity index 100% rename from src/sugar/gsm-client.c rename to src/sugar3/gsm-client.c diff --git a/src/sugar/gsm-client.h b/src/sugar3/gsm-client.h similarity index 100% rename from src/sugar/gsm-client.h rename to src/sugar3/gsm-client.h diff --git a/src/sugar/gsm-session.c b/src/sugar3/gsm-session.c similarity index 100% rename from src/sugar/gsm-session.c rename to src/sugar3/gsm-session.c diff --git a/src/sugar/gsm-session.h b/src/sugar3/gsm-session.h similarity index 100% rename from src/sugar/gsm-session.h rename to src/sugar3/gsm-session.h diff --git a/src/sugar/gsm-xsmp.c b/src/sugar3/gsm-xsmp.c similarity index 100% rename from src/sugar/gsm-xsmp.c rename to src/sugar3/gsm-xsmp.c diff --git a/src/sugar/gsm-xsmp.h b/src/sugar3/gsm-xsmp.h similarity index 100% rename from src/sugar/gsm-xsmp.h rename to src/sugar3/gsm-xsmp.h diff --git a/src/sugar/network.py b/src/sugar3/network.py similarity index 100% rename from src/sugar/network.py rename to src/sugar3/network.py diff --git a/src/sugar/presence/Makefile.am b/src/sugar3/presence/Makefile.am similarity index 78% rename from src/sugar/presence/Makefile.am rename to src/sugar3/presence/Makefile.am index 6d87fe7d..7322ecbb 100644 --- a/src/sugar/presence/Makefile.am +++ b/src/sugar3/presence/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pythondir)/sugar/presence +sugardir = $(pythondir)/sugar3/presence sugar_PYTHON = \ __init__.py \ activity.py \ diff --git a/src/sugar/presence/__init__.py b/src/sugar3/presence/__init__.py similarity index 100% rename from src/sugar/presence/__init__.py rename to src/sugar3/presence/__init__.py diff --git a/src/sugar/presence/activity.py b/src/sugar3/presence/activity.py similarity index 100% rename from src/sugar/presence/activity.py rename to src/sugar3/presence/activity.py diff --git a/src/sugar/presence/buddy.py b/src/sugar3/presence/buddy.py similarity index 100% rename from src/sugar/presence/buddy.py rename to src/sugar3/presence/buddy.py diff --git a/src/sugar/presence/connectionmanager.py b/src/sugar3/presence/connectionmanager.py similarity index 100% rename from src/sugar/presence/connectionmanager.py rename to src/sugar3/presence/connectionmanager.py diff --git a/src/sugar/presence/presenceservice.py b/src/sugar3/presence/presenceservice.py similarity index 100% rename from src/sugar/presence/presenceservice.py rename to src/sugar3/presence/presenceservice.py diff --git a/src/sugar/presence/sugartubeconn.py b/src/sugar3/presence/sugartubeconn.py similarity index 100% rename from src/sugar/presence/sugartubeconn.py rename to src/sugar3/presence/sugartubeconn.py diff --git a/src/sugar/presence/test_presence.txt b/src/sugar3/presence/test_presence.txt similarity index 100% rename from src/sugar/presence/test_presence.txt rename to src/sugar3/presence/test_presence.txt diff --git a/src/sugar/presence/tubeconn.py b/src/sugar3/presence/tubeconn.py similarity index 100% rename from src/sugar/presence/tubeconn.py rename to src/sugar3/presence/tubeconn.py diff --git a/src/sugar/profile.py b/src/sugar3/profile.py similarity index 100% rename from src/sugar/profile.py rename to src/sugar3/profile.py diff --git a/src/sugar/session.py b/src/sugar3/session.py similarity index 100% rename from src/sugar/session.py rename to src/sugar3/session.py diff --git a/src/sugar/sugar-grid.c b/src/sugar3/sugar-grid.c similarity index 100% rename from src/sugar/sugar-grid.c rename to src/sugar3/sugar-grid.c diff --git a/src/sugar/sugar-grid.h b/src/sugar3/sugar-grid.h similarity index 100% rename from src/sugar/sugar-grid.h rename to src/sugar3/sugar-grid.h diff --git a/src/sugar/sugar-key-grabber.c b/src/sugar3/sugar-key-grabber.c similarity index 100% rename from src/sugar/sugar-key-grabber.c rename to src/sugar3/sugar-key-grabber.c diff --git a/src/sugar/sugar-key-grabber.h b/src/sugar3/sugar-key-grabber.h similarity index 100% rename from src/sugar/sugar-key-grabber.h rename to src/sugar3/sugar-key-grabber.h diff --git a/src/sugar/sugar-marshal.list b/src/sugar3/sugar-marshal.list similarity index 100% rename from src/sugar/sugar-marshal.list rename to src/sugar3/sugar-marshal.list diff --git a/src/sugar/sugar-menu.c b/src/sugar3/sugar-menu.c similarity index 100% rename from src/sugar/sugar-menu.c rename to src/sugar3/sugar-menu.c diff --git a/src/sugar/sugar-menu.h b/src/sugar3/sugar-menu.h similarity index 100% rename from src/sugar/sugar-menu.h rename to src/sugar3/sugar-menu.h diff --git a/src/sugar/util.py b/src/sugar3/util.py similarity index 100% rename from src/sugar/util.py rename to src/sugar3/util.py diff --git a/src/sugar/wm.py b/src/sugar3/wm.py similarity index 100% rename from src/sugar/wm.py rename to src/sugar3/wm.py