From 137b8ddd230154208f0e05e24da126bfc39a5d3d Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Fri, 3 Nov 2006 22:24:16 +0100 Subject: [PATCH 1/4] Release 0.47 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index accf1e47..0426c2d9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([Sugar],[0.46],[],[sugar]) +AC_INIT([Sugar],[0.47],[],[sugar]) AC_PREREQ([2.59]) From 6d84d886e190264062eab75dfc2c96633944f351 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Sun, 5 Nov 2006 03:25:51 +0100 Subject: [PATCH 2/4] Fixup services path with the various installed/uninstalled 0.94/0.95 combinations. What a pain! --- Makefile.am | 2 +- dbus-installed.conf.in | 3 +-- dbus-uninstalled-094.conf | 25 +++++++++++++++++++++++++ dbus-uninstalled.conf | 2 +- services/presence/Makefile.am | 2 +- sugar-emulator | 10 ++++++++-- sugar/__installed__.py.in | 3 ++- sugar/__uninstalled__.py | 1 + sugar/env.py | 3 +++ 9 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 dbus-uninstalled-094.conf diff --git a/Makefile.am b/Makefile.am index adb34ab3..d66d590a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,7 @@ bin_SCRIPTS = \ install-data-local: $(top_srcdir)/sugar/setup.py \ $(top_srcdir)/activities \ - $(DESTDIR)$(pkgdatadir)/activities \ + $(DESTDIR)$(datadir)/dbus-1/services \ $(bindir)/sugar-activity-factory uninstall-local: diff --git a/dbus-installed.conf.in b/dbus-installed.conf.in index 7b6d6074..ca0c208c 100644 --- a/dbus-installed.conf.in +++ b/dbus-installed.conf.in @@ -10,8 +10,7 @@ unix:tmpdir=/tmp - @prefix@/share/sugar/activities - @prefix@/share/sugar/services + @prefix@/share/dbus-1/services /tmp/sugar-services diff --git a/dbus-uninstalled-094.conf b/dbus-uninstalled-094.conf new file mode 100644 index 00000000..fbed2d6a --- /dev/null +++ b/dbus-uninstalled-094.conf @@ -0,0 +1,25 @@ + + + + + + session + + unix:tmpdir=/tmp + + /tmp/sugar + /tmp/sugar-services + + + + + + + + + + + diff --git a/dbus-uninstalled.conf b/dbus-uninstalled.conf index fbed2d6a..fa4e6f2f 100644 --- a/dbus-uninstalled.conf +++ b/dbus-uninstalled.conf @@ -10,8 +10,8 @@ unix:tmpdir=/tmp + /tmp/sugar - /tmp/sugar-services diff --git a/services/presence/Makefile.am b/services/presence/Makefile.am index f64bc02f..9b40ed3d 100644 --- a/services/presence/Makefile.am +++ b/services/presence/Makefile.am @@ -1,4 +1,4 @@ -servicedir = $(datadir)/sugar/services +servicedir = $(datadir)/dbus-1/services service_in_files = org.laptop.Presence.service.in service_DATA = $(service_in_files:.service.in=.service) diff --git a/sugar-emulator b/sugar-emulator index e9ba62c3..11e606fb 100755 --- a/sugar-emulator +++ b/sugar-emulator @@ -73,6 +73,12 @@ emulator.start() if env.get_dbus_version() < '0.95': if not os.path.isdir('/tmp/sugar-services'): os.mkdir('/tmp/sugar-services') + dbus_config = env.get_dbus_config_094() +else: + dbus_config = env.get_dbus_config() -os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', - '--config-file=%s' % env.get_dbus_config(), program) +if dbus_config: + os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', + '--config-file=%s' % dbus_config, program) +else: + os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', program) diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in index 832fca50..e1fdcfc3 100644 --- a/sugar/__installed__.py.in +++ b/sugar/__installed__.py.in @@ -3,5 +3,6 @@ sugar_data_dir = '@prefix@/share/sugar' sugar_activities_dir = '@prefix@/share/sugar/activities' sugar_activity_info_dir = '@prefix@/share/sugar/activities' sugar_services_dir = '@prefix@/share/sugar/services' -sugar_dbus_config = '@prefix@/share/sugar/dbus-installed.conf' +sugar_dbus_config = None +sugar_dbus_config_094 = '@prefix@/share/sugar/dbus-installed.conf' sugar_shell_bin_dir = '@prefix@/bin' diff --git a/sugar/__uninstalled__.py b/sugar/__uninstalled__.py index e0bfc295..121e0508 100644 --- a/sugar/__uninstalled__.py +++ b/sugar/__uninstalled__.py @@ -9,4 +9,5 @@ sugar_services_dir = os.path.join(_sourcedir, 'services') sugar_activity_info_dir = _tmpdir sugar_activities_dir = os.path.join(_sourcedir, 'activities') sugar_dbus_config = os.path.join(_sourcedir, 'dbus-uninstalled.conf') +sugar_dbus_config_094 = os.path.join(_sourcedir, 'dbus-uninstalled-094.conf') sugar_shell_bin_dir = os.path.join(_sourcedir, 'shell') diff --git a/sugar/env.py b/sugar/env.py index 3f958b23..209f3460 100644 --- a/sugar/env.py +++ b/sugar/env.py @@ -54,6 +54,9 @@ def get_services_dir(): def get_dbus_config(): return sugar_dbus_config +def get_dbus_config_094(): + return sugar_dbus_config_094 + def get_shell_bin_dir(): return sugar_shell_bin_dir From 984035f933733cba2023a014e9874f40067b93bc Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Sun, 5 Nov 2006 03:33:49 +0100 Subject: [PATCH 3/4] Revert "Fixup services path with the various installed/uninstalled 0.94/0.95 combinations. What a pain!" This reverts commit 6d84d886e190264062eab75dfc2c96633944f351. --- Makefile.am | 2 +- dbus-installed.conf.in | 3 ++- dbus-uninstalled-094.conf | 25 ------------------------- dbus-uninstalled.conf | 2 +- services/presence/Makefile.am | 2 +- sugar-emulator | 10 ++-------- sugar/__installed__.py.in | 3 +-- sugar/__uninstalled__.py | 1 - sugar/env.py | 3 --- 9 files changed, 8 insertions(+), 43 deletions(-) delete mode 100644 dbus-uninstalled-094.conf diff --git a/Makefile.am b/Makefile.am index d66d590a..adb34ab3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,7 @@ bin_SCRIPTS = \ install-data-local: $(top_srcdir)/sugar/setup.py \ $(top_srcdir)/activities \ - $(DESTDIR)$(datadir)/dbus-1/services \ + $(DESTDIR)$(pkgdatadir)/activities \ $(bindir)/sugar-activity-factory uninstall-local: diff --git a/dbus-installed.conf.in b/dbus-installed.conf.in index ca0c208c..7b6d6074 100644 --- a/dbus-installed.conf.in +++ b/dbus-installed.conf.in @@ -10,7 +10,8 @@ unix:tmpdir=/tmp - @prefix@/share/dbus-1/services + @prefix@/share/sugar/activities + @prefix@/share/sugar/services /tmp/sugar-services diff --git a/dbus-uninstalled-094.conf b/dbus-uninstalled-094.conf deleted file mode 100644 index fbed2d6a..00000000 --- a/dbus-uninstalled-094.conf +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - session - - unix:tmpdir=/tmp - - /tmp/sugar - /tmp/sugar-services - - - - - - - - - - - diff --git a/dbus-uninstalled.conf b/dbus-uninstalled.conf index fa4e6f2f..fbed2d6a 100644 --- a/dbus-uninstalled.conf +++ b/dbus-uninstalled.conf @@ -10,8 +10,8 @@ unix:tmpdir=/tmp - /tmp/sugar + /tmp/sugar-services diff --git a/services/presence/Makefile.am b/services/presence/Makefile.am index 9b40ed3d..f64bc02f 100644 --- a/services/presence/Makefile.am +++ b/services/presence/Makefile.am @@ -1,4 +1,4 @@ -servicedir = $(datadir)/dbus-1/services +servicedir = $(datadir)/sugar/services service_in_files = org.laptop.Presence.service.in service_DATA = $(service_in_files:.service.in=.service) diff --git a/sugar-emulator b/sugar-emulator index 11e606fb..e9ba62c3 100755 --- a/sugar-emulator +++ b/sugar-emulator @@ -73,12 +73,6 @@ emulator.start() if env.get_dbus_version() < '0.95': if not os.path.isdir('/tmp/sugar-services'): os.mkdir('/tmp/sugar-services') - dbus_config = env.get_dbus_config_094() -else: - dbus_config = env.get_dbus_config() -if dbus_config: - os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', - '--config-file=%s' % dbus_config, program) -else: - os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', program) +os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', + '--config-file=%s' % env.get_dbus_config(), program) diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in index e1fdcfc3..832fca50 100644 --- a/sugar/__installed__.py.in +++ b/sugar/__installed__.py.in @@ -3,6 +3,5 @@ sugar_data_dir = '@prefix@/share/sugar' sugar_activities_dir = '@prefix@/share/sugar/activities' sugar_activity_info_dir = '@prefix@/share/sugar/activities' sugar_services_dir = '@prefix@/share/sugar/services' -sugar_dbus_config = None -sugar_dbus_config_094 = '@prefix@/share/sugar/dbus-installed.conf' +sugar_dbus_config = '@prefix@/share/sugar/dbus-installed.conf' sugar_shell_bin_dir = '@prefix@/bin' diff --git a/sugar/__uninstalled__.py b/sugar/__uninstalled__.py index 121e0508..e0bfc295 100644 --- a/sugar/__uninstalled__.py +++ b/sugar/__uninstalled__.py @@ -9,5 +9,4 @@ sugar_services_dir = os.path.join(_sourcedir, 'services') sugar_activity_info_dir = _tmpdir sugar_activities_dir = os.path.join(_sourcedir, 'activities') sugar_dbus_config = os.path.join(_sourcedir, 'dbus-uninstalled.conf') -sugar_dbus_config_094 = os.path.join(_sourcedir, 'dbus-uninstalled-094.conf') sugar_shell_bin_dir = os.path.join(_sourcedir, 'shell') diff --git a/sugar/env.py b/sugar/env.py index 209f3460..3f958b23 100644 --- a/sugar/env.py +++ b/sugar/env.py @@ -54,9 +54,6 @@ def get_services_dir(): def get_dbus_config(): return sugar_dbus_config -def get_dbus_config_094(): - return sugar_dbus_config_094 - def get_shell_bin_dir(): return sugar_shell_bin_dir From 4b328c84176fb9142112600d80c55a81e529176d Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Sun, 5 Nov 2006 03:41:44 +0100 Subject: [PATCH 4/4] Less invasive solution for the reverted commit --- .gitignore | 1 + Makefile.am | 2 +- configure.ac | 3 ++- dbus-installed-094.conf.in | 26 ++++++++++++++++++++++++++ dbus-installed.conf.in | 1 + dbus-uninstalled-094.conf | 25 +++++++++++++++++++++++++ dbus-uninstalled.conf | 1 + sugar-emulator | 5 ++++- sugar/__installed__.py.in | 1 + sugar/__uninstalled__.py | 1 + sugar/env.py | 3 +++ 11 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 dbus-installed-094.conf.in create mode 100644 dbus-uninstalled-094.conf diff --git a/.gitignore b/.gitignore index 214150f7..07489270 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ missing py-compile stamp-h1 dbus-installed.conf +dbus-installed-094.conf intltool-extract intltool-extract.in intltool-merge diff --git a/Makefile.am b/Makefile.am index adb34ab3..58822d05 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = activities lib po shell sugar services tools ACLOCAL_AMFLAGS = -I m4 dbusconfdir = $(pkgdatadir) -dbusconf_DATA = dbus-installed.conf +dbusconf_DATA = dbus-installed.conf dbus-installed-094.conf bin_SCRIPTS = \ sugar-emulator \ diff --git a/configure.ac b/configure.ac index 0426c2d9..e62cb43f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([Sugar],[0.47],[],[sugar]) +AC_INIT([Sugar],[0.48],[],[sugar]) AC_PREREQ([2.59]) @@ -51,6 +51,7 @@ AM_GLIB_GNU_GETTEXT AC_OUTPUT([ Makefile dbus-installed.conf +dbus-installed-094.conf activities/Makefile activities/web/Makefile activities/chat/Makefile diff --git a/dbus-installed-094.conf.in b/dbus-installed-094.conf.in new file mode 100644 index 00000000..7b6d6074 --- /dev/null +++ b/dbus-installed-094.conf.in @@ -0,0 +1,26 @@ + + + + + + session + + unix:tmpdir=/tmp + + @prefix@/share/sugar/activities + @prefix@/share/sugar/services + /tmp/sugar-services + + + + + + + + + + + diff --git a/dbus-installed.conf.in b/dbus-installed.conf.in index 7b6d6074..4e811975 100644 --- a/dbus-installed.conf.in +++ b/dbus-installed.conf.in @@ -10,6 +10,7 @@ unix:tmpdir=/tmp + @prefix@/share/sugar/activities @prefix@/share/sugar/services /tmp/sugar-services diff --git a/dbus-uninstalled-094.conf b/dbus-uninstalled-094.conf new file mode 100644 index 00000000..fbed2d6a --- /dev/null +++ b/dbus-uninstalled-094.conf @@ -0,0 +1,25 @@ + + + + + + session + + unix:tmpdir=/tmp + + /tmp/sugar + /tmp/sugar-services + + + + + + + + + + + diff --git a/dbus-uninstalled.conf b/dbus-uninstalled.conf index fbed2d6a..ed3dc741 100644 --- a/dbus-uninstalled.conf +++ b/dbus-uninstalled.conf @@ -10,6 +10,7 @@ unix:tmpdir=/tmp + /tmp/sugar /tmp/sugar-services diff --git a/sugar-emulator b/sugar-emulator index e9ba62c3..6635a395 100755 --- a/sugar-emulator +++ b/sugar-emulator @@ -73,6 +73,9 @@ emulator.start() if env.get_dbus_version() < '0.95': if not os.path.isdir('/tmp/sugar-services'): os.mkdir('/tmp/sugar-services') + dbus_config = env.get_dbus_config_094() +else: + dbus_config = env.get_dbus_config() os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', - '--config-file=%s' % env.get_dbus_config(), program) + '--config-file=%s' % dbus_config, program) diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in index 832fca50..78489f43 100644 --- a/sugar/__installed__.py.in +++ b/sugar/__installed__.py.in @@ -4,4 +4,5 @@ sugar_activities_dir = '@prefix@/share/sugar/activities' sugar_activity_info_dir = '@prefix@/share/sugar/activities' sugar_services_dir = '@prefix@/share/sugar/services' sugar_dbus_config = '@prefix@/share/sugar/dbus-installed.conf' +sugar_dbus_config_094 = '@prefix@/share/sugar/dbus-installed-094.conf' sugar_shell_bin_dir = '@prefix@/bin' diff --git a/sugar/__uninstalled__.py b/sugar/__uninstalled__.py index e0bfc295..121e0508 100644 --- a/sugar/__uninstalled__.py +++ b/sugar/__uninstalled__.py @@ -9,4 +9,5 @@ sugar_services_dir = os.path.join(_sourcedir, 'services') sugar_activity_info_dir = _tmpdir sugar_activities_dir = os.path.join(_sourcedir, 'activities') sugar_dbus_config = os.path.join(_sourcedir, 'dbus-uninstalled.conf') +sugar_dbus_config_094 = os.path.join(_sourcedir, 'dbus-uninstalled-094.conf') sugar_shell_bin_dir = os.path.join(_sourcedir, 'shell') diff --git a/sugar/env.py b/sugar/env.py index 3f958b23..209f3460 100644 --- a/sugar/env.py +++ b/sugar/env.py @@ -54,6 +54,9 @@ def get_services_dir(): def get_dbus_config(): return sugar_dbus_config +def get_dbus_config_094(): + return sugar_dbus_config_094 + def get_shell_bin_dir(): return sugar_shell_bin_dir