=== modified file 'NEWS' --- NEWS 2010-04-26 17:33:10 +0000 +++ NEWS 2010-06-13 19:26:58 +0000 @@ -1,3 +1,21 @@ +Quickly 0.4.3 +------------------------------------ + + quickly core: + - fix wrong template proposal for commands not followed by template + ubuntu-application template: + - change label caption from glade to design (LP: #571409) + - fix dialog when having - in title name (LP: #578710) + - fix unicode problems in About dialog (LP: #582584) (Petar Vasić) + - fix the boiler plate for faulty preferences dialog code (LP: #587090) + (Nick Veitch) + ubuntu-application and inherited: + - fix configure stripping team name for ppa (LP: #587314) (Frederik Elwert) + - fix not all syntax for dependencies supported (LP: #587520) (Frederik + Elwert) + - fix issue and description of release: quickly release + updated translations + Quickly 0.4.2 ------------------------------------ === modified file 'bin/quickly' --- bin/quickly 2010-03-28 17:37:04 +0000 +++ bin/quickly 2010-04-27 08:08:50 +0000 @@ -96,21 +96,21 @@ except IndexError: # to help the user, we can search if this command_name corresponds to a command in a template list_possible_commands = commands.get_commands_by_criteria(name=command_name, followed_by_template=True) + proposed_templates = [] + for template in commands.get_all_templates(): + try: + commands.get_all_commands()[template][command_name] + proposed_templates.append(template) + except KeyError: + pass if list_possible_commands: - proposed_templates = [] - for template in commands.get_all_templates(): - try: - commands.get_all_commands()[template][command_name] - proposed_templates.append(template) - except KeyError: - pass print _("ERROR: %s command must be followed by a template and no template was found on the command line." % command_name) print _("Candidates template are: %s") % ", ".join(proposed_templates) else: list_possible_commands = commands.get_commands_by_criteria(name=command_name, followed_by_template=False) if list_possible_commands: print _("No template were found on the command line for command %s." % command_name) - print _("Candidates template are: %s") % ", ".join([command.template for command in list_possible_commands]) + print _("Candidates template are: %s") % ", ".join(proposed_templates) else: # there is really not such command, in any template print _("ERROR: No %s command found.") % command_name === modified file 'data/templates/ubuntu-application/add.py' --- data/templates/ubuntu-application/add.py 2010-04-08 08:57:35 +0000 +++ data/templates/ubuntu-application/add.py 2010-05-19 08:25:16 +0000 @@ -82,7 +82,7 @@ sys.exit(4) else: try: - dialog_name = templatetools.quickly_name(argv[2]) + dialog_name = templatetools.quickly_name(argv[2]).replace('-','_') except templatetools.bad_project_name, e: print(e) sys.exit(1) @@ -127,7 +127,7 @@ ("project_camel_case_name",project_camel_case_name), ("project_sentence_name",project_sentence_name), ("dialog_sentence_name",dialog_sentence_name), - ( "python_name",python_name)) + ("python_name",python_name)) quicklyutils.file_from_template(template_ui_dir, "dialog_camel_case_nameDialog.ui", === modified file 'data/templates/ubuntu-application/configure.py' --- data/templates/ubuntu-application/configure.py 2010-03-08 18:56:57 +0000 +++ data/templates/ubuntu-application/configure.py 2010-06-11 11:13:06 +0000 @@ -19,6 +19,7 @@ import os import sys import tempfile +import subprocess import internal.apportutils @@ -124,7 +125,10 @@ print "%s - %s" % (ppa_name, ppa_display_name) sys.exit(1) - configurationhandler.project_config['ppa'] = ppa_name + if ppa_user.is_team: + configurationhandler.project_config['ppa'] = '%s/%s' % (ppa_user.name, ppa_name) + else: + configurationhandler.project_config['ppa'] = ppa_name configurationhandler.saveConfig() # change default bzr push branch @@ -140,7 +144,7 @@ if not configurationhandler.project_config: configurationhandler.loadConfig() try: - dependencies = [elem for elem in configurationhandler.project_config['dependencies'].split(' ') if elem] + dependencies = [elem.strip() for elem in configurationhandler.project_config['dependencies'].split(',') if elem] except KeyError: dependencies = [] depfile_name = tempfile.mkstemp()[1] @@ -149,8 +153,8 @@ dependencies = [] os.system("%s %s" % (editor, depfile_name)) for depends in file(depfile_name, 'r'): - dependencies.extend([elem for elem in depends[:-1].split(' ') if elem]) + dependencies.extend([elem.strip() for elem in depends.split(',') if elem]) os.remove(depfile_name) - configurationhandler.project_config['dependencies'] = " ".join(dependencies) + configurationhandler.project_config['dependencies'] = ", ".join(dependencies) configurationhandler.saveConfig() === added file 'data/templates/ubuntu-application/help/po/de.po' === modified file 'data/templates/ubuntu-application/help/po/es.po' === added file 'data/templates/ubuntu-application/help/po/fr.po' === modified file 'data/templates/ubuntu-application/help/po/hu.po' === modified file 'data/templates/ubuntu-application/internal/packaging.py' --- data/templates/ubuntu-application/internal/packaging.py 2010-04-06 15:15:12 +0000 +++ data/templates/ubuntu-application/internal/packaging.py 2010-06-11 11:13:06 +0000 @@ -168,9 +168,11 @@ if not configurationhandler.project_config: configurationhandler.loadConfig() try: - for elem in configurationhandler.project_config['dependencies'].split(' '): - if elem: - command.extend(["--dependency", elem]) + dependencies = [elem.strip() for elem + in configurationhandler.project_config['dependencies'].split(',') + if elem] + for dep in dependencies: + command.extend(["--dependency", dep]) except KeyError: pass === modified file 'data/templates/ubuntu-application/license.py' --- data/templates/ubuntu-application/license.py 2010-02-20 20:45:28 +0000 +++ data/templates/ubuntu-application/license.py 2010-05-19 08:25:19 +0000 @@ -235,10 +235,10 @@ # get copyright holders and authors for line in file(fauthors_name, 'r'): if "copyright" in line.lower() or "(c)" in line.lower(): - copyright_holders += line - authors_holders += line + copyright_holders += line.decode('UTF-8') + authors_holders += line.decode('UTF-8') else: - authors_holders += line + authors_holders += line.decode('UTF-8') # update without last \n quicklyutils.change_xml_elem(about_dialog_file_name, "object/property", === modified file 'data/templates/ubuntu-application/project_root/bin/project_name' --- data/templates/ubuntu-application/project_root/bin/project_name 2010-03-15 16:43:17 +0000 +++ data/templates/ubuntu-application/project_root/bin/project_name 2010-06-01 15:24:43 +0000 @@ -83,7 +83,7 @@ launchpad_available = False # Uncomment the following code to read in preferences at start up. - #dlg = Preferencescamel_case_nameDialog.NewPreferencescamel_case_nameDialog() + #dlg = Preferencescamel_case_nameDialog.Preferencescamel_case_nameDialog() #self.preferences = dlg.get_preferences() # Code for other initialization actions should be added here. === modified file 'data/templates/ubuntu-application/project_root/data/ui/camel_case_nameWindow.ui' --- data/templates/ubuntu-application/project_root/data/ui/camel_case_nameWindow.ui 2010-02-20 05:57:01 +0000 +++ data/templates/ubuntu-application/project_root/data/ui/camel_case_nameWindow.ui 2010-04-28 20:57:32 +0000 @@ -183,7 +183,7 @@ 5 Your application has been created! -To start changing this user interface, run 'quickly glade', which will open Glade so you can edit the default windows and dialogs. +To start changing this user interface, run 'quickly design', which will open Glade so you can edit the default windows and dialogs. To change the behavior and edit the python code, run 'quickly edit', which will bring up a text editor. True === modified file 'data/templates/ubuntu-application/release.py' --- data/templates/ubuntu-application/release.py 2010-04-18 16:38:19 +0000 +++ data/templates/ubuntu-application/release.py 2010-06-13 19:26:58 +0000 @@ -62,11 +62,10 @@ Name, email and version setup.py will be automatically changed. (version will be and bzr will commit and tagged. -Once the release is done, will be incremented -by 0.1 to be ready for next release. -If you previously used quickly shared ~publicX -will be dropped to release version -(~publicX < ) +Once the release is done, will use year.month<.release> +<.release> is incremented by 1 for each release in the same month. +If you previously used quickly shared -publicX + You can modify the description and long description if you wish. You can run $quickly package and test your package to make sure it @@ -112,7 +111,7 @@ if len(args) == 1: proposed_version = None elif len(args) == 2: - proposed_version = None + proposed_version = args[1] elif len(args) > 2: proposed_version = args[1] commit_msg = " ".join(args[2:]) === modified file 'data/templates/ubuntu-application/upgrade.py' --- data/templates/ubuntu-application/upgrade.py 2010-04-08 08:57:35 +0000 +++ data/templates/ubuntu-application/upgrade.py 2010-06-11 11:13:06 +0000 @@ -155,4 +155,14 @@ python_name, substitutions) +if project_version < '0.4.3': + ## update dependencies format + if 'dependencies' in configurationhandler.project_config \ + and not ',' in configurationhandler.project_config['dependencies']: + dependencies = [elem for elem + in configurationhandler.project_config['dependencies'].split(' ') + if elem] + configurationhandler.project_config['dependencies'] = ", ".join(dependencies) + configurationhandler.saveConfig() + sys.exit(0) === modified file 'debian/changelog' --- debian/changelog 2010-04-26 17:34:48 +0000 +++ debian/changelog 2010-06-13 19:26:58 +0000 @@ -1,3 +1,23 @@ +quickly (0.4.3-0ubuntu1) lucid-proposed; urgency=low + + * New bugfix release: + quickly core: + - fix wrong template proposal for commands not followed by template + ubuntu-application template: + - change label caption from glade to design (LP: #571409) + - fix dialog when having - in title name (LP: #578710) + - fix unicode problems in About dialog (LP: #582584) (Petar Vasić) + - fix the boiler plate for faulty preferences dialog code (LP: #587090) + (Nick Veitch) + ubuntu-application and inherited: + - fix configure stripping team name for ppa (LP: #587314) (Frederik Elwert) + - fix not all syntax for dependencies supported (LP: #587520) (Frederik + Elwert) + - fix issue and description of release: quickly release + updated translations + + -- Didier Roche Fri, 11 Jun 2010 13:18:01 +0200 + quickly (0.4.2-0ubuntu1) lucid; urgency=low * New bugfix upstream release: === modified file 'po/ar.po' === modified file 'po/ast.po' === modified file 'po/ca.po' === modified file 'po/cs.po' === modified file 'po/de.po' === modified file 'po/en_GB.po' === modified file 'po/es.po' === modified file 'po/eu.po' === modified file 'po/fr.po' === modified file 'po/ga.po' === modified file 'po/gl.po' === modified file 'po/hu.po' === modified file 'po/id.po' === modified file 'po/nb.po' === modified file 'po/nl.po' === modified file 'po/pl.po' === modified file 'po/pt_BR.po' === modified file 'po/ru.po' === modified file 'po/si.po' === modified file 'po/te.po' === modified file 'po/zh_CN.po' === modified file 'quickly/configurationhandler.py' --- quickly/configurationhandler.py 2010-02-14 00:00:07 +0000 +++ quickly/configurationhandler.py 2010-06-11 11:13:06 +0000 @@ -48,7 +48,7 @@ fileconfig = file(quickly_file_path, 'rb') for line in fileconfig: fields = line.split('#')[0] # Suppress commentary after the value in configuration file and in full line - fields = fields.split('=') # Separate variable from value + fields = fields.split('=', 1) # Separate variable from value # normally, we have two fields in "fields" if len(fields) == 2: config[fields[0].strip()] = fields[1].strip() @@ -90,7 +90,7 @@ for line in fileconfig: fields = line.split('#')[0] # Suppress commentary after the value in configuration file and in full line fieldsafter = line.split('#')[1:] - fields = fields.split('=') # Separate variable from value + fields = fields.split('=', 1) # Separate variable from value # normally, we have two fields in "fields" and it should be used by config tabular if len(fields) == 2: if fields[0].strip() in remaingconfigtosave: === modified file 'quickly/quicklyconfig.py' --- quickly/quicklyconfig.py 2010-04-26 17:34:48 +0000 +++ quickly/quicklyconfig.py 2010-06-11 11:13:06 +0000 @@ -20,7 +20,7 @@ # you're warned :) # quickly version used for project format compatibility -__version__ = '0.4.2' +__version__ = '0.4.3' # where quickly will head for quickly data (for instance, templates) # by default, this is ../data, relative to trunk layout === modified file 'setup.py' --- setup.py 2010-04-26 17:34:48 +0000 +++ setup.py 2010-06-11 11:19:21 +0000 @@ -18,7 +18,7 @@ # UPDATE VERSION WHEN NEEDED (it updates all versions needed to be updated) -VERSION = '0.4.2' +VERSION = '0.4.3' import glob import os