Jokosher

Merge lp:~michael-sheldon/jokosher/misc into lp:jokosher

  1. misc
  2. Merge into main
Proposed by Michael Sheldon
Status: Merged
Merged at revision: not available
Proposed branch: lp:~michael-sheldon/jokosher/misc
Merge into: lp:jokosher
Diff against target: None lines
To merge this branch: bzr merge lp:~michael-sheldon/jokosher/misc
Reviewer Review Type Date Requested Status
Jokosher Code Pending
Review via email: mp+6900@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Jokosher/Jokosher'
--- Jokosher/Jokosher 2009-05-06 15:30:01 +0000
+++ Jokosher/Jokosher 2009-05-29 23:09:32 +0000
@@ -67,7 +67,7 @@
67openproject = None67openproject = None
68loadExtensions = True68loadExtensions = True
6969
70parser = optparse.OptionParser(usage="%prog [options] [project-file]", version="0.11.2")70parser = optparse.OptionParser(usage="%prog [options] [project-file]", version="0.11.3")
71#command line options71#command line options
72parser.add_option("-d", "--debug", action="store_true", dest="debug", 72parser.add_option("-d", "--debug", action="store_true", dest="debug",
73 help=_("Print debug output to stdout"))73 help=_("Print debug output to stdout"))
7474
=== modified file 'Jokosher/Jokosher.glade'
--- Jokosher/Jokosher.glade 2009-05-06 15:30:01 +0000
+++ Jokosher/Jokosher.glade 2009-05-29 23:09:32 +0000
@@ -847,7 +847,7 @@
847 <property name="name" translatable="yes">Jokosher</property>847 <property name="name" translatable="yes">Jokosher</property>
848 <property name="copyright" translatable="yes"></property>848 <property name="copyright" translatable="yes"></property>
849 <property name="comments" translatable="yes">Audio production made simple.849 <property name="comments" translatable="yes">Audio production made simple.
850Version 0.11.2</property>850Version 0.11.3</property>
851 <property name="license"> GNU GENERAL PUBLIC LICENSE851 <property name="license"> GNU GENERAL PUBLIC LICENSE
852 Version 2, June 1991852 Version 2, June 1991
853853
854854
=== modified file 'README'
--- README 2009-05-06 15:30:01 +0000
+++ README 2009-05-29 23:09:32 +0000
@@ -1,4 +1,4 @@
1Welcome to Jokosher 0.11.2!1Welcome to Jokosher 0.11.3!
22
3Jokosher is a simple and easy to use audio multi-tracker3Jokosher is a simple and easy to use audio multi-tracker
4for the Linux desktop. The aim of the project is to 4for the Linux desktop. The aim of the project is to
@@ -22,6 +22,7 @@
22* Python Cairo22* Python Cairo
23* Python Dbus23* Python Dbus
24* Python Setuptools 24* Python Setuptools
25* Python XDG
2526
2627
27> Running Jokosher <28> Running Jokosher <
2829
=== modified file 'bin/jokosher'
--- bin/jokosher 2009-05-06 15:30:01 +0000
+++ bin/jokosher 2009-05-29 23:09:32 +0000
@@ -56,7 +56,7 @@
56openproject = None56openproject = None
57loadExtensions = True57loadExtensions = True
5858
59parser = optparse.OptionParser(usage="%prog [options] [project-file]", version="0.11.2")59parser = optparse.OptionParser(usage="%prog [options] [project-file]", version="0.11.3")
60#command line options60#command line options
61parser.add_option("-d", "--debug", action="store_true", dest="debug", 61parser.add_option("-d", "--debug", action="store_true", dest="debug",
62 help=_("Print debug output to stdout"))62 help=_("Print debug output to stdout"))
6363
=== removed file 'extensions/FreesoundSearch-0.2-py2.4.egg'
64Binary files extensions/FreesoundSearch-0.2-py2.4.egg 2008-08-07 23:52:45 +0000 and extensions/FreesoundSearch-0.2-py2.4.egg 1970-01-01 00:00:00 +0000 differ64Binary files extensions/FreesoundSearch-0.2-py2.4.egg 2008-08-07 23:52:45 +0000 and extensions/FreesoundSearch-0.2-py2.4.egg 1970-01-01 00:00:00 +0000 differ
=== added file 'extensions/FreesoundSearch-0.3-py2.6.egg'
65Binary files extensions/FreesoundSearch-0.3-py2.6.egg 1970-01-01 00:00:00 +0000 and extensions/FreesoundSearch-0.3-py2.6.egg 2009-05-29 23:03:59 +0000 differ65Binary files extensions/FreesoundSearch-0.3-py2.6.egg 1970-01-01 00:00:00 +0000 and extensions/FreesoundSearch-0.3-py2.6.egg 2009-05-29 23:03:59 +0000 differ
=== modified file 'extensions/eggs/FreesoundSearch/setup.py'
--- extensions/eggs/FreesoundSearch/setup.py 2007-02-09 01:09:19 +0000
+++ extensions/eggs/FreesoundSearch/setup.py 2009-05-29 23:03:59 +0000
@@ -2,7 +2,7 @@
2import sys, os2import sys, os
3from shutil import copy3from shutil import copy
44
5version = "0.2"5version = "0.3"
6setup(name="FreesoundSearch",6setup(name="FreesoundSearch",
7 version=version,7 version=version,
8 author='Stuart Langridge, David Corrales',8 author='Stuart Langridge, David Corrales',
99
=== modified file 'extensions/eggs/FreesoundSearch/src/FreesoundSearch.glade'
--- extensions/eggs/FreesoundSearch/src/FreesoundSearch.glade 2007-05-10 03:28:01 +0000
+++ extensions/eggs/FreesoundSearch/src/FreesoundSearch.glade 2009-05-29 23:03:59 +0000
@@ -684,7 +684,7 @@
684 <widget class="GtkLabel" id="label14">684 <widget class="GtkLabel" id="label14">
685 <property name="visible">True</property>685 <property name="visible">True</property>
686 <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Jokosher Freesound Extension&lt;/b&gt;&lt;/big&gt;686 <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Jokosher Freesound Extension&lt;/b&gt;&lt;/big&gt;
687version 0.2</property>687version 0.3</property>
688 <property name="use_underline">False</property>688 <property name="use_underline">False</property>
689 <property name="use_markup">True</property>689 <property name="use_markup">True</property>
690 <property name="justify">GTK_JUSTIFY_CENTER</property>690 <property name="justify">GTK_JUSTIFY_CENTER</property>
691691
=== modified file 'extensions/eggs/FreesoundSearch/src/FreesoundSearch.py'
--- extensions/eggs/FreesoundSearch/src/FreesoundSearch.py 2008-04-27 15:06:06 +0000
+++ extensions/eggs/FreesoundSearch/src/FreesoundSearch.py 2009-05-29 23:03:59 +0000
@@ -36,7 +36,7 @@
36 36
37 # necessary extension attributes37 # necessary extension attributes
38 EXTENSION_NAME = _("Freesound search")38 EXTENSION_NAME = _("Freesound search")
39 EXTENSION_VERSION = "0.2"39 EXTENSION_VERSION = "0.3"
40 EXTENSION_DESCRIPTION = _("Searches the Freesound library of freely" + \40 EXTENSION_DESCRIPTION = _("Searches the Freesound library of freely" + \
41 " licenceable and useable sound clips")41 " licenceable and useable sound clips")
42 42
4343
=== modified file 'setup.py'
--- setup.py 2009-05-06 15:30:01 +0000
+++ setup.py 2009-05-29 23:09:32 +0000
@@ -38,11 +38,11 @@
38 OMFFILES.append((omfdir, glob.glob("help/jokosher/*.omf")))38 OMFFILES.append((omfdir, glob.glob("help/jokosher/*.omf")))
39 39
40dist = setup(name='jokosher',40dist = setup(name='jokosher',
41 version='0.11.2',41 version='0.11.3',
42 author='Jokosher Project',42 author='Jokosher Project',
43 author_email='corrales.david@gmail.com',43 author_email='jokosher-devel-list@gnome.org',
44 maintainer='David Corrales',44 maintainer='Jokosher Project',
45 maintainer_email='corrales.david@gmail.com',45 maintainer_email='jokosher-devel-list@gnome.org',
46 description='Multi-track non-linear audio editing.',46 description='Multi-track non-linear audio editing.',
47 long_description='Jokosher is a simple yet powerful multi-track studio. With it you can create and record music, podcasts and more, all from an integrated simple environment.',47 long_description='Jokosher is a simple yet powerful multi-track studio. With it you can create and record music, podcasts and more, all from an integrated simple environment.',
48 url='http://www.jokosher.org/',48 url='http://www.jokosher.org/',
4949
=== modified file 'setup_win32.py'
--- setup_win32.py 2009-05-06 15:30:01 +0000
+++ setup_win32.py 2009-05-29 23:09:32 +0000
@@ -7,9 +7,9 @@
7import py2exe7import py2exe
88
9dist = setup(name='jokosher',9dist = setup(name='jokosher',
10 version='0.11.2',10 version='0.11.3',
11 author='Jokosher Project',11 author='Jokosher Project',
12 author_email='jokosher-devel@gnome.org',12 author_email='jokosher-devel-list@gnome.org',
13 maintainer='Michael Sheldon',13 maintainer='Michael Sheldon',
14 maintainer_email='mike@mikeasoft.com',14 maintainer_email='mike@mikeasoft.com',
15 description='Multi-track non-linear audio editing.',15 description='Multi-track non-linear audio editing.',
1616
=== modified file 'windows_installer.iss'
--- windows_installer.iss 2009-05-06 15:30:01 +0000
+++ windows_installer.iss 2009-05-29 23:09:32 +0000
@@ -1,6 +1,6 @@
1[Setup]1[Setup]
2AppName =Jokosher2AppName =Jokosher
3AppVerName=Jokosher version 0.11.23AppVerName=Jokosher version 0.11.3
4DefaultDirName={pf}\Jokosher4DefaultDirName={pf}\Jokosher
5DefaultGroupName=Jokosher5DefaultGroupName=Jokosher
6Compression=bzip/96Compression=bzip/9

Subscribers

People subscribed via source and target branches