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
1=== modified file 'Jokosher/Jokosher'
2--- Jokosher/Jokosher 2009-05-06 15:30:01 +0000
3+++ Jokosher/Jokosher 2009-05-29 23:09:32 +0000
4@@ -67,7 +67,7 @@
5 openproject = None
6 loadExtensions = True
7
8-parser = optparse.OptionParser(usage="%prog [options] [project-file]", version="0.11.2")
9+parser = optparse.OptionParser(usage="%prog [options] [project-file]", version="0.11.3")
10 #command line options
11 parser.add_option("-d", "--debug", action="store_true", dest="debug",
12 help=_("Print debug output to stdout"))
13
14=== modified file 'Jokosher/Jokosher.glade'
15--- Jokosher/Jokosher.glade 2009-05-06 15:30:01 +0000
16+++ Jokosher/Jokosher.glade 2009-05-29 23:09:32 +0000
17@@ -847,7 +847,7 @@
18 <property name="name" translatable="yes">Jokosher</property>
19 <property name="copyright" translatable="yes"></property>
20 <property name="comments" translatable="yes">Audio production made simple.
21-Version 0.11.2</property>
22+Version 0.11.3</property>
23 <property name="license"> GNU GENERAL PUBLIC LICENSE
24 Version 2, June 1991
25
26
27=== modified file 'README'
28--- README 2009-05-06 15:30:01 +0000
29+++ README 2009-05-29 23:09:32 +0000
30@@ -1,4 +1,4 @@
31-Welcome to Jokosher 0.11.2!
32+Welcome to Jokosher 0.11.3!
33
34 Jokosher is a simple and easy to use audio multi-tracker
35 for the Linux desktop. The aim of the project is to
36@@ -22,6 +22,7 @@
37 * Python Cairo
38 * Python Dbus
39 * Python Setuptools
40+* Python XDG
41
42
43 > Running Jokosher <
44
45=== modified file 'bin/jokosher'
46--- bin/jokosher 2009-05-06 15:30:01 +0000
47+++ bin/jokosher 2009-05-29 23:09:32 +0000
48@@ -56,7 +56,7 @@
49 openproject = None
50 loadExtensions = True
51
52-parser = optparse.OptionParser(usage="%prog [options] [project-file]", version="0.11.2")
53+parser = optparse.OptionParser(usage="%prog [options] [project-file]", version="0.11.3")
54 #command line options
55 parser.add_option("-d", "--debug", action="store_true", dest="debug",
56 help=_("Print debug output to stdout"))
57
58=== removed file 'extensions/FreesoundSearch-0.2-py2.4.egg'
59Binary 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
60=== added file 'extensions/FreesoundSearch-0.3-py2.6.egg'
61Binary 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
62=== modified file 'extensions/eggs/FreesoundSearch/setup.py'
63--- extensions/eggs/FreesoundSearch/setup.py 2007-02-09 01:09:19 +0000
64+++ extensions/eggs/FreesoundSearch/setup.py 2009-05-29 23:03:59 +0000
65@@ -2,7 +2,7 @@
66 import sys, os
67 from shutil import copy
68
69-version = "0.2"
70+version = "0.3"
71 setup(name="FreesoundSearch",
72 version=version,
73 author='Stuart Langridge, David Corrales',
74
75=== modified file 'extensions/eggs/FreesoundSearch/src/FreesoundSearch.glade'
76--- extensions/eggs/FreesoundSearch/src/FreesoundSearch.glade 2007-05-10 03:28:01 +0000
77+++ extensions/eggs/FreesoundSearch/src/FreesoundSearch.glade 2009-05-29 23:03:59 +0000
78@@ -684,7 +684,7 @@
79 <widget class="GtkLabel" id="label14">
80 <property name="visible">True</property>
81 <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Jokosher Freesound Extension&lt;/b&gt;&lt;/big&gt;
82-version 0.2</property>
83+version 0.3</property>
84 <property name="use_underline">False</property>
85 <property name="use_markup">True</property>
86 <property name="justify">GTK_JUSTIFY_CENTER</property>
87
88=== modified file 'extensions/eggs/FreesoundSearch/src/FreesoundSearch.py'
89--- extensions/eggs/FreesoundSearch/src/FreesoundSearch.py 2008-04-27 15:06:06 +0000
90+++ extensions/eggs/FreesoundSearch/src/FreesoundSearch.py 2009-05-29 23:03:59 +0000
91@@ -36,7 +36,7 @@
92
93 # necessary extension attributes
94 EXTENSION_NAME = _("Freesound search")
95- EXTENSION_VERSION = "0.2"
96+ EXTENSION_VERSION = "0.3"
97 EXTENSION_DESCRIPTION = _("Searches the Freesound library of freely" + \
98 " licenceable and useable sound clips")
99
100
101=== modified file 'setup.py'
102--- setup.py 2009-05-06 15:30:01 +0000
103+++ setup.py 2009-05-29 23:09:32 +0000
104@@ -38,11 +38,11 @@
105 OMFFILES.append((omfdir, glob.glob("help/jokosher/*.omf")))
106
107 dist = setup(name='jokosher',
108- version='0.11.2',
109+ version='0.11.3',
110 author='Jokosher Project',
111- author_email='corrales.david@gmail.com',
112- maintainer='David Corrales',
113- maintainer_email='corrales.david@gmail.com',
114+ author_email='jokosher-devel-list@gnome.org',
115+ maintainer='Jokosher Project',
116+ maintainer_email='jokosher-devel-list@gnome.org',
117 description='Multi-track non-linear audio editing.',
118 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.',
119 url='http://www.jokosher.org/',
120
121=== modified file 'setup_win32.py'
122--- setup_win32.py 2009-05-06 15:30:01 +0000
123+++ setup_win32.py 2009-05-29 23:09:32 +0000
124@@ -7,9 +7,9 @@
125 import py2exe
126
127 dist = setup(name='jokosher',
128- version='0.11.2',
129+ version='0.11.3',
130 author='Jokosher Project',
131- author_email='jokosher-devel@gnome.org',
132+ author_email='jokosher-devel-list@gnome.org',
133 maintainer='Michael Sheldon',
134 maintainer_email='mike@mikeasoft.com',
135 description='Multi-track non-linear audio editing.',
136
137=== modified file 'windows_installer.iss'
138--- windows_installer.iss 2009-05-06 15:30:01 +0000
139+++ windows_installer.iss 2009-05-29 23:09:32 +0000
140@@ -1,6 +1,6 @@
141 [Setup]
142 AppName =Jokosher
143-AppVerName=Jokosher version 0.11.2
144+AppVerName=Jokosher version 0.11.3
145 DefaultDirName={pf}\Jokosher
146 DefaultGroupName=Jokosher
147 Compression=bzip/9

Subscribers

People subscribed via source and target branches