[Sugar-devel] [PATCH] Remove sugar-activity

2011-12-13 Thread Daniel Drake
This binary has been moved to sugar-toolkit-gtk3 in a commit
titled:
 sugar-activity: import and make independent of sugar-toolkit GTK versions

sugar-toolkit-gtk3 is deemed as a more suitable home as sugar-activity
is somewhat specific to activities built with sugar-toolkit.
From this point onwards sugar-toolkit-gtk3 will become a required
part of the platform and hence installed on all user's systems.
---
 bin/Makefile.am|1 -
 bin/sugar-activity |   21 -
 2 files changed, 0 insertions(+), 22 deletions(-)
 delete mode 100644 bin/sugar-activity

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 05a9215..8fc5692 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,5 +1,4 @@
 python_scripts =   \
-   sugar-activity  \
sugar-control-panel \
sugar-emulator  \
sugar-install-bundle\
diff --git a/bin/sugar-activity b/bin/sugar-activity
deleted file mode 100644
index 4abdd80..000
--- a/bin/sugar-activity
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2006-2008, Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-from sugar.activity import main
-
-main.main()
-- 
1.7.7.4

___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


Re: [Sugar-devel] [PATCH] Remove sugar-activity

2011-12-13 Thread Sascha Silbe
Excerpts from Daniel Drake's message of 2011-12-13 21:01:10 +0100:

 This binary has been moved to sugar-toolkit-gtk3 in a commit
 titled:
  sugar-activity: import and make independent of sugar-toolkit GTK versions
 
 sugar-toolkit-gtk3 is deemed as a more suitable home as sugar-activity
 is somewhat specific to activities built with sugar-toolkit.
 From this point onwards sugar-toolkit-gtk3 will become a required
 part of the platform and hence installed on all user's systems.

Acked-by: Sascha Silbe si...@activitycentral.com

Please hold off on pushing this until sugar-jhbuild has been updated to
build sugar-toolkit-gtk3. Otherwise you'd hose everyone who develops
features based on mainline master rather than the stable branches
(sucrose-*).

Sascha

-- 
http://sascha.silbe.org/
http://www.infra-silbe.de/


signature.asc
Description: PGP signature
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel