Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWalter Bender <walter.bender@gmail.com>2011-10-28 12:14:04 (GMT)
committer Walter Bender <walter.bender@gmail.com>2011-10-28 12:14:04 (GMT)
commit010ee3fcc3e0bb4e7ef7a64ff104bcfe4eabd7c6 (patch)
tree167729ab43883b1d1cc7bb63f57a2ecf965ff8ad
parent3573674242e66a389cba3c90e107595be9133c23 (diff)
fixed license address as per #3219v11
-rw-r--r--FractionBounceActivity.py8
-rw-r--r--NEWS14
-rw-r--r--activity/activity.info2
-rw-r--r--ball.py10
-rw-r--r--bar.py10
-rw-r--r--bounce.py9
-rw-r--r--play_audio.py4
-rw-r--r--svg_utils.py12
-rw-r--r--toolbar_utils.py10
-rw-r--r--utils.py12
10 files changed, 47 insertions, 44 deletions
diff --git a/FractionBounceActivity.py b/FractionBounceActivity.py
index be1b387..51113ff 100644
--- a/FractionBounceActivity.py
+++ b/FractionBounceActivity.py
@@ -6,10 +6,10 @@
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU General Public License
+# along with this library; if not, write to the Free Software
+# Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
+
import gtk
import os
diff --git a/NEWS b/NEWS
index 2485226..a05de13 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+11
+
+ENHANCEMENT:
+* New translations
+
+BUG FIX:
+* Fixed address in license (#3219)
+
10
ENHANCEMENT:
@@ -19,7 +27,7 @@ ENHANCEMENTS:
7
ENHANCEMENTS:
-* simplify EASY level
+* Simplify EASY level
6
@@ -65,7 +73,3 @@ BUG FIXES:
1
* New activity: bounce the ball onto the fraction
-
-
-
-
diff --git a/activity/activity.info b/activity/activity.info
index ff6c10b..d65f3f1 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
[Activity]
name = FractionBounce
-activity_version = 10
+activity_version = 11
license = GPLv3
bundle_id = org.sugarlabs.FractionBounceActivity
exec = sugar-activity FractionBounceActivity.FractionBounceActivity
diff --git a/ball.py b/ball.py
index 630919a..eddb414 100644
--- a/ball.py
+++ b/ball.py
@@ -1,15 +1,15 @@
# -*- coding: utf-8 -*-
#Copyright (c) 2011, Walter Bender, Paulina Clares, Chris Rowe
-#
+
# 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 3 of the License, or
# (at your option) any later version.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU General Public License
+# along with this library; if not, write to the Free Software
+# Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
+
import gtk
from math import pi
diff --git a/bar.py b/bar.py
index 66dae81..88311f9 100644
--- a/bar.py
+++ b/bar.py
@@ -1,15 +1,15 @@
# -*- coding: utf-8 -*-
#Copyright (c) 2011, Walter Bender, Paulina Clares, Chris Rowe
-#
+
# 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 3 of the License, or
# (at your option) any later version.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU General Public License
+# along with this library; if not, write to the Free Software
+# Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
+
from sprites import Sprite
from svg_utils import svg_header, svg_footer, svg_rect, svg_str_to_pixbuf
diff --git a/bounce.py b/bounce.py
index 615a6b5..e8badcd 100644
--- a/bounce.py
+++ b/bounce.py
@@ -1,15 +1,14 @@
# -*- coding: utf-8 -*-
#Copyright (c) 2011, Walter Bender, Paulina Clares, Chris Rowe
-#
+
# 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 3 of the License, or
# (at your option) any later version.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU General Public License
+# along with this library; if not, write to the Free Software
+# Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
# The challenges are arrays:
# [a fraction to display on the ball,
diff --git a/play_audio.py b/play_audio.py
index 2ed445b..f535631 100644
--- a/play_audio.py
+++ b/play_audio.py
@@ -19,8 +19,8 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
+# Foundation, Inc., 51 Franklin Street, Suite 500 Boston, MA
+# 02110-1335 USA
import subprocess
diff --git a/svg_utils.py b/svg_utils.py
index 2e02b5e..2bbc67d 100644
--- a/svg_utils.py
+++ b/svg_utils.py
@@ -1,15 +1,15 @@
# -*- coding: utf-8 -*-
-#Copyright (c) 2011, Walter Bender
-#
+# Copyright (c) 2011, Walter Bender
+
# 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 3 of the License, or
# (at your option) any later version.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU General Public License
+# along with this library; if not, write to the Free Software
+# Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
+
import gtk
from math import sin, cos, pi
diff --git a/toolbar_utils.py b/toolbar_utils.py
index b75a464..9b7f6be 100644
--- a/toolbar_utils.py
+++ b/toolbar_utils.py
@@ -1,15 +1,15 @@
# -*- coding: utf-8 -*-
-#Copyright (c) 2011, Walter Bender
+# Copyright (c) 2011, Walter Bender
# 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 3 of the License, or
# (at your option) any later version.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU General Public License
+# along with this library; if not, write to the Free Software
+# Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
+
import gtk
diff --git a/utils.py b/utils.py
index 4d8f906..148b05e 100644
--- a/utils.py
+++ b/utils.py
@@ -1,15 +1,15 @@
# -*- coding: utf-8 -*-
-#Copyright (c) 2011, Walter Bender
-#
+# Copyright (c) 2011, Walter Bender
+
# 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 3 of the License, or
# (at your option) any later version.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU General Public License
+# along with this library; if not, write to the Free Software
+# Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
+
import gtk