Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore15
-rw-r--r--AUTHORS5
-rw-r--r--COPYING133
-rw-r--r--ChangeLog0
-rw-r--r--INSTALL0
-rw-r--r--Makefile.am11
-rw-r--r--NEWS1
-rw-r--r--README47
-rw-r--r--__init__.py0
-rw-r--r--activity/activity.info5
-rwxr-xr-xautogen.sh20
-rw-r--r--configure.ac20
-rw-r--r--csserver/Makefile.am8
-rw-r--r--memosono.activity7
-rw-r--r--osc/Makefile.am5
-rw-r--r--sounds/Makefile.am0
-rw-r--r--sounds/Makefile.am~39
17 files changed, 6 insertions, 310 deletions
diff --git a/.gitignore b/.gitignore
index a228c6a..0d20b64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1 @@
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-config.h
-config.h.in
-config.log
-config.status
-configure
-install-sh
-missing
-py-compile
-stamp-h1
-csnd.pyc \ No newline at end of file
+*.pyc
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 6df2261..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1,5 +0,0 @@
-- Simon Schampijer simon@schampijer.de
- Memoson
-
-- Daniel Holth and Clinton McChesney:
- The Python implementation of OSC. \ No newline at end of file
diff --git a/COPYING b/COPYING
deleted file mode 100644
index 4734ef2..0000000
--- a/COPYING
+++ /dev/null
@@ -1,133 +0,0 @@
-GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them asimpose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, th OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING \ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index e69de29..0000000
--- a/ChangeLog
+++ /dev/null
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index e69de29..0000000
--- a/INSTALL
+++ /dev/null
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 933efaf..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-SUBDIRS = images sounds osc csserver
-
-activitydir = $(datadir)/sugar/activities/memosono
-activity_PYTHON = \
- __init__.py \
- memosono.py
-
-EXTRA_DIST = memosono.activity
-
-install-data-local:
- sugar-setup-activity $(srcdir)/memosono.activity
diff --git a/NEWS b/NEWS
deleted file mode 100644
index 20a665b..0000000
--- a/NEWS
+++ /dev/null
@@ -1 +0,0 @@
-This is a new release of Memosono as a two player version for the b1-release. \ No newline at end of file
diff --git a/README b/README
deleted file mode 100644
index d6ce10c..0000000
--- a/README
+++ /dev/null
@@ -1,47 +0,0 @@
-*************************************************
-*** Memosono - a two player one machine version
-*************************************************
-Version: V02
-Simon Schampijer - simon@schampijer.de
-
-How to use Memosono:
-
-1) Make sure the python bindings for csound are installed.
-
-You need the two files (csnd.py, _csnd.so) either in:
-/usr/lib/python2.4/site-packages/ or in the folder csserver
-in the memoson folder.
-
-
-2) Where to place the memoson sources?
-
-You can place the folder with the sources and the images etc anywhere you want on your harddisk. I used relative paths so I hope there will be never a crash like - can not find file. But it does matter where you place your game files. They should be placed in the home directory. (this can be changed in a later implementation)
-A typical game folder contains:
-
-Example: The game composer
-composer (a)
- - composer.mson (b)
- - images/ (c)
- - sounds/ (d)
-
-a) This folder has got the name of the game. It is important that the name of this folder and the first part of the name of the config file are identical.
-
-b) A config file in the format (<gamename>.mson) containing the names of the sounds and images you want to use. The config file is very very basic but I am planning to use fancy stuff (probably xml) in the future. Put in the pairs you want to use like.
- bach.jpg bach.wav
- beethoven.jpg beethoven.aiff
-
-As you see above it does not matter how many spaces are between the picture and the soundfile. Soundfile formats can be wav and aiff. As Image formats I always used jpeg but maybe gif will work as well. SVG would be an alternative at least for the application pictures.
-
-c) Place here the images.
-d) PLace the soundfiles here
-
-3) Howto start a game:
-To start a game type: ./memoson.py <name of the game>
-
-You do not have to specify the folder or the name of the config file explicitly since the application looks for a folder and a config file in the home directory like described above.
-
-
-
-4) Technical Details:
-Memosono uses the Open SoundControl (OSC) for the communication between the clients and the server. The Python implementation of OSC was done by Daniel Holth and Clinton McChesney. Thanks for their work.
-
diff --git a/__init__.py b/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/__init__.py
+++ /dev/null
diff --git a/activity/activity.info b/activity/activity.info
new file mode 100644
index 0000000..2a632ad
--- /dev/null
+++ b/activity/activity.info
@@ -0,0 +1,5 @@
+[Activity]
+name = Memosono
+service_name = com.erikos.MemosonoActivity
+exec = sugar-activity-factory com.erikos.MemosonoActivity memosono.MemosonoActivity
+icon = activity-memorygame
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 63eff6c..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="memosono"
-
-(test -f $srcdir/README) || {
- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
- echo " top-level $PKG_NAME directory"
- exit 1
-}
-
-which gnome-autogen.sh || {
- echo "You need to install gnome-common from the GNOME CVS"
- exit 1
-}
-
-REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index c3643cc..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,20 +0,0 @@
-AC_INIT([Memosono],[0.2],[],[memosono])
-
-AC_PREREQ([2.59])
-
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_SRCDIR([configure.ac])
-
-AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip])
-
-AM_MAINTAINER_MODE
-
-AM_PATH_PYTHON
-
-AC_OUTPUT([
-Makefile
-sounds/Makefile
-images/Makefile
-osc/Makefile
-csserver/Makefile
-])
diff --git a/csserver/Makefile.am b/csserver/Makefile.am
deleted file mode 100644
index 844809f..0000000
--- a/csserver/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-imagesdir = $(datadir)/sugar/activities/memosono/csserver
-images_DATA = \
-universe.py \
-univorc.csd \
-csnd.py \
-_csnd.so
-
-
diff --git a/memosono.activity b/memosono.activity
deleted file mode 100644
index 0af806e..0000000
--- a/memosono.activity
+++ /dev/null
@@ -1,7 +0,0 @@
-[Activity]
-name = Memosono
-id = com.erikos.MemosonoActivity
-python_module = memosono.memosono.MemosonoActivity
-default_type = _memosono_olpc._udp
-show_launcher = yes
-icon = activity-memorygame
diff --git a/osc/Makefile.am b/osc/Makefile.am
deleted file mode 100644
index c2d9e6b..0000000
--- a/osc/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-imagesdir = $(datadir)/sugar/activities/memosono/osc
-images_DATA = \
-oscAPI.py \
-OSC.py \
-__init__.py
diff --git a/sounds/Makefile.am b/sounds/Makefile.am
deleted file mode 100644
index e69de29..0000000
--- a/sounds/Makefile.am
+++ /dev/null
diff --git a/sounds/Makefile.am~ b/sounds/Makefile.am~
deleted file mode 100644
index d192bf3..0000000
--- a/sounds/Makefile.am~
+++ /dev/null
@@ -1,39 +0,0 @@
-imagesdir = $(datadir)/sugar/activities/memosono/images
-images_DATA = \
-black80.jpg \
-player1_0b.jpg \
-player1_0.jpg \
-player1_1b.jpg \
-player1_1.jpg \
-player1_2b.jpg \
-player1_2.jpg \
-player1_3b.jpg \
-player1_3.jpg \
-player1_4b.jpg \
-player1_4.jpg \
-player1_5b.jpg \
-player1_5.jpg \
-player1_6b.jpg \
-player1_6.jpg \
-player1_7b.jpg \
-player1_7.jpg \
-player1_8b.jpg \
-player1_8.jpg \
-player2_0b.jpg \
-player2_0.jpg \
-player2_1b.jpg \
-player2_1.jpg \
-player2_2b.jpg \
-player2_2.jpg \
-player2_3b.jpg \
-player2_3.jpg \
-player2_4b.jpg \
-player2_4.jpg \
-player2_5b.jpg \
-player2_5.jpg \
-player2_6b.jpg \
-player2_6.jpg \
-player2_7b.jpg \
-player2_7.jpg \
-player2_8b.jpg \
-player2_8.jpg