From 58a57985025f4fc61ea9c2a38e65c5fabb2440ae Mon Sep 17 00:00:00 2001 From: Ajay Garg Date: Mon, 01 Apr 2013 18:48:09 +0000 Subject: Initial commit (with fix for sdxo#3406). --- diff --git a/do_it_all.sh b/do_it_all.sh new file mode 100644 index 0000000..7e92d9c --- /dev/null +++ b/do_it_all.sh @@ -0,0 +1,22 @@ +set -e + +git_url="git://git.sugarlabs.org/tamtam/tamtam.git" + + +# Remove the upstream cloned-directory, if any. +if [ -d "activity" ]; then + sudo rm -r activity +fi + +# Clone a fresh copy of the upstream. +git clone "$git_url" activity + +# Build the activity (to generate "generated" files such as locale files). +cd activity + +# Now, apply the AC patches. +git am ../patches/*.patch + +# Finally, build the bundle (to be retrieved from "activity/dist"). +python setup.py dist_xo + diff --git a/patches/0001-sdxo-3406-Making-TamTamMini-not-sharable-in-the-UI.patch b/patches/0001-sdxo-3406-Making-TamTamMini-not-sharable-in-the-UI.patch new file mode 100644 index 0000000..45c0239 --- /dev/null +++ b/patches/0001-sdxo-3406-Making-TamTamMini-not-sharable-in-the-UI.patch @@ -0,0 +1,42 @@ +From ad739c98cf6062e451f490448354337341c6cc17 Mon Sep 17 00:00:00 2001 +From: Ajay Garg +Date: Tue, 2 Apr 2013 00:00:39 +0530 +Subject: [PATCH] sdxo#3406: Making "TamTamMini" not-sharable in the UI. +Organization: Sugar Labs Foundation + + +Signed-off-by: Ajay Garg +--- + TamTamMini.py | 2 ++ + activity/activity.info | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/TamTamMini.py b/TamTamMini.py +index 03af715..760d1de 100644 +--- a/TamTamMini.py ++++ b/TamTamMini.py +@@ -50,6 +50,8 @@ class TamTamMini(activity.Activity): + + activity.Activity.__init__(self, handle) + ++ self.max_participants = 1 ++ + #color = Gdk.color_parse(Config.WS_BCK_COLOR) + #self.modify_bg(Gtk.StateType.NORMAL, color) + +diff --git a/activity/activity.info b/activity/activity.info +index 18a7d4f..efe7ed1 100644 +--- a/activity/activity.info ++++ b/activity/activity.info +@@ -12,7 +12,7 @@ description = TamTam is a suite of four music and sound related activities + homepage = http://wiki.sugarlabs.org/go/Activities/TamTam + license = GPLv2+ + +-version = 66 ++version = 66.1 + stability = stable + + icon = %(component_name)s +-- +1.7.11.7 + -- cgit v0.9.1