diff -Nru exiflow-0.4.5.15/debian/changelog exiflow-0.4.5.16/debian/changelog --- exiflow-0.4.5.15/debian/changelog 2014-02-18 00:39:21.000000000 +0000 +++ exiflow-0.4.5.16/debian/changelog 2014-02-18 00:39:21.000000000 +0000 @@ -1,56 +1,39 @@ -exiflow (0.4.5.15-1ppa1~saucy1) saucy; urgency=low +exiflow (0.4.5.16-1ppa1~saucy1) saucy; urgency=low - * Upload Exiflow 0.4.5.15 for saucy. + * Upload Exiflow 0.4.5.16 for saucy. - -- Sebastian Berthold Mon, 17 Feb 2014 22:02:53 +0100 + -- Sebastian Berthold Tue, 18 Feb 2014 01:37:06 +0100 -exiflow (0.4.5.15-1ppa1~raring1) raring; urgency=low +exiflow (0.4.5.16-1ppa1~raring1) raring; urgency=low - * Upload Exiflow 0.4.5.15 for raring. + * Upload Exiflow 0.4.5.16 for raring. - -- Sebastian Berthold Mon, 17 Feb 2014 22:02:46 +0100 + -- Sebastian Berthold Tue, 18 Feb 2014 01:36:59 +0100 -exiflow (0.4.5.15-1ppa1~quantal1) quantal; urgency=low +exiflow (0.4.5.16-1ppa1~quantal1) quantal; urgency=low - * Upload Exiflow 0.4.5.15 for quantal. + * Upload Exiflow 0.4.5.16 for quantal. - -- Sebastian Berthold Mon, 17 Feb 2014 22:02:39 +0100 + -- Sebastian Berthold Tue, 18 Feb 2014 01:36:53 +0100 -exiflow (0.4.5.15-1ppa1~precise1) precise; urgency=low +exiflow (0.4.5.16-1ppa1~precise1) precise; urgency=low - * Upload Exiflow 0.4.5.15 for precise. + * Upload Exiflow 0.4.5.16 for precise. - -- Sebastian Berthold Mon, 17 Feb 2014 22:02:32 +0100 + -- Sebastian Berthold Tue, 18 Feb 2014 01:36:46 +0100 -exiflow (0.4.5.15-1ppa1~oneiric1) oneiric; urgency=low +exiflow (0.4.5.16-1ppa1~lucid1) lucid; urgency=low - * Upload Exiflow 0.4.5.15 for oneiric. + * Upload Exiflow 0.4.5.16 for lucid. - -- Sebastian Berthold Mon, 17 Feb 2014 22:02:24 +0100 + -- Sebastian Berthold Tue, 18 Feb 2014 01:36:38 +0100 -exiflow (0.4.5.15-1ppa1~natty1) natty; urgency=low - - * Upload Exiflow 0.4.5.15 for natty. - - -- Sebastian Berthold Mon, 17 Feb 2014 22:02:17 +0100 - -exiflow (0.4.5.15-1ppa1~maverick1) maverick; urgency=low - - * Upload Exiflow 0.4.5.15 for maverick. - - -- Sebastian Berthold Mon, 17 Feb 2014 22:02:11 +0100 - -exiflow (0.4.5.15-1ppa1~lucid1) lucid; urgency=low - - * Upload Exiflow 0.4.5.15 for lucid. - - -- Sebastian Berthold Mon, 17 Feb 2014 22:02:04 +0100 - -exiflow (0.4.5.15-1) UNRELEASED; urgency=low +exiflow (0.4.5.16-1) UNRELEASED; urgency=low * Release Exiflow 0.4.5.15. + * Release Exiflow 0.4.5.16. - -- Sebastian Berthold Mon, 17 Feb 2014 22:01:55 +0100 + -- Sebastian Berthold Tue, 18 Feb 2014 01:35:56 +0100 exiflow (0.4.5.14-1) precise; urgency=low diff -Nru exiflow-0.4.5.15/exiflow/configfile.py exiflow-0.4.5.16/exiflow/configfile.py --- exiflow-0.4.5.15/exiflow/configfile.py 2013-01-24 19:26:09.000000000 +0000 +++ exiflow-0.4.5.16/exiflow/configfile.py 2014-02-17 23:17:48.000000000 +0000 @@ -10,7 +10,6 @@ __revision__ = "$Id: " import os -import sys import logging import ConfigParser @@ -56,12 +55,12 @@ #[C2040Z] #cam_id = o00 """, - "exif": """# exif.cfg + "exif": """# exif.cfg # This file contains EXIF information to be inserted into images. # Configure global values in the [all] section and camera specific values # in a section for the camera model. It is also possible to create sections # with arbitrary names and supply these names later on the command line. -# All supported tags of ExifTool are allowed as keys - so it's possible to set +# All supported tags of ExifTool are allowed as keys - so it's possible to set # or unset (just use "keyword =") specific tags with exiperson. #[all] @@ -72,7 +71,7 @@ #Credit = adent@example.com # ATTENTION: You will want to set UserComment to an empty string even if you # do not use it. It will prevent Exiftool from setting it to the word "ASCII". -#UserComment = +#UserComment = #[custom] #artist = I. M. Weasel @@ -81,7 +80,7 @@ #artist = I. R. Baboon #[GT-I9100] -#ImageUniqueID = +#ImageUniqueID = """} @@ -108,9 +107,9 @@ logger = logging.getLogger("configfile.parse") local_config = os.path.join(local_config_dir, configname + ".cfg") global_config = os.path.join(global_config_dir, configname + ".cfg") - if not configname in __cache \ - or __stats.get(local_config, None) != __stat(local_config) \ - or __stats.get(global_config, None) != __stat(global_config): + if (not configname in __cache + or __stats.get(local_config, None) != __stat(local_config) + or __stats.get(global_config, None) != __stat(global_config)): if not os.path.exists(local_config): if not os.path.isdir(local_config_dir): os.makedirs(local_config_dir) diff -Nru exiflow-0.4.5.15/exiflow/exiassign.py exiflow-0.4.5.16/exiflow/exiassign.py --- exiflow-0.4.5.15/exiflow/exiassign.py 2013-01-15 22:59:54.000000000 +0000 +++ exiflow-0.4.5.16/exiflow/exiassign.py 2014-02-17 22:57:08.000000000 +0000 @@ -14,7 +14,7 @@ look at 20050914-n001235-jd100.jpg and 20050914-n001235-jd000.nef in this order to copy the EXIF header from. """ -__revision__ = "$Id: exiassign.py 363 2012-07-21 10:24:18Z rompe $" +__revision__ = "$Id$" import os import re diff -Nru exiflow-0.4.5.15/exiflow/exiconvert.py exiflow-0.4.5.16/exiflow/exiconvert.py --- exiflow-0.4.5.15/exiflow/exiconvert.py 2013-01-15 22:59:54.000000000 +0000 +++ exiflow-0.4.5.16/exiflow/exiconvert.py 2014-02-17 23:17:48.000000000 +0000 @@ -25,7 +25,7 @@ For example, a file "test.nef" should result in "test.jpg". """ -__revision__ = "$Id: exiconvert.py 363 2012-07-21 10:24:18Z rompe $" +__revision__ = "$Id$" import os import re @@ -56,7 +56,7 @@ raw_extension, raw_converter = \ configfile.get_options("cameras", model, - ("raw_extension", "raw_converter")) + ("raw_extension", "raw_converter")) if raw_extension == "": logger.warning("No raw_extension configured, skipping %s", basename) @@ -76,7 +76,7 @@ else: command = raw_converter + " " + filename process = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + stderr=subprocess.PIPE) for line in process.stderr: logger.warning(line) for line in process.stdout: @@ -116,7 +116,7 @@ logging.getLogger().setLevel(logging.INFO) logger = logging.getLogger("exiconvert") - filename_re = re.compile("^(\d{8}(-\d{6})?-.{3}\d{4}-.{2})000\.jpg$") + filename_re = re.compile("^(\\d{8}(-\\d{6})?-.{3}\\d{4}-.{2})000\\.jpg$") for filename, percentage in filelist.Filelist(args): callback_filename = None logger.info("%3s%% %s", percentage, filename) @@ -133,7 +133,7 @@ mymatch = filename_re.match(newname) if mymatch: lqname = os.path.join(os.path.dirname(filename), - mymatch.group(1) + "00l.jpg") + mymatch.group(1) + "00l.jpg") if os.path.exists(lqname): try: os.remove(lqname) diff -Nru exiflow-0.4.5.15/exiflow/exif.py exiflow-0.4.5.16/exiflow/exif.py --- exiflow-0.4.5.15/exiflow/exif.py 2013-01-15 22:59:54.000000000 +0000 +++ exiflow-0.4.5.16/exiflow/exif.py 2014-02-17 22:57:08.000000000 +0000 @@ -4,7 +4,7 @@ """ A module for reading and writing EXIF information. """ -__revision__ = "$Id: exif.py 382 2013-01-15 21:51:58Z rompe $" +__revision__ = "$Id$" import re import locale diff -Nru exiflow-0.4.5.15/exiflow/exigate.py exiflow-0.4.5.16/exiflow/exigate.py --- exiflow-0.4.5.15/exiflow/exigate.py 2013-01-15 22:59:54.000000000 +0000 +++ exiflow-0.4.5.16/exiflow/exigate.py 2014-02-17 23:17:48.000000000 +0000 @@ -5,7 +5,7 @@ Automatically gate image meta information between EXIF headers and Gthumb comment files. """ -__revision__ = "$Id: exigate.py 363 2012-07-21 10:24:18Z rompe $" +__revision__ = "$Id$" import os import sys @@ -50,9 +50,9 @@ # if that is needed and if so, if we can do it conditionally! gthumbfile.set_mtime(filetimestamp) os.utime(filename, (filetimestamp, filetimestamp)) - elif filetimestamp > gthumbtimestamp \ - or myoptions.addfields \ - or myoptions.template: + elif (filetimestamp > gthumbtimestamp + or myoptions.addfields + or myoptions.template): logger.info("Updating comment file from %s.", filename) exif_file = exif.Exif(filename) try: diff -Nru exiflow-0.4.5.15/exiflow/exigui.glade exiflow-0.4.5.16/exiflow/exigui.glade --- exiflow-0.4.5.15/exiflow/exigui.glade 2014-02-17 20:57:00.000000000 +0000 +++ exiflow-0.4.5.16/exiflow/exigui.glade 2014-02-18 00:21:17.000000000 +0000 @@ -1073,7 +1073,7 @@ True GDK_WINDOW_TYPE_HINT_NORMAL ExiFlow - 0.4.5.15 + 0.4.5.16 © Copyright 2006-2014. Some rights reserved. This is a beta version. Use at your own risk. http://exiflow.org/ diff -Nru exiflow-0.4.5.15/exiflow/exigui.py exiflow-0.4.5.16/exiflow/exigui.py --- exiflow-0.4.5.15/exiflow/exigui.py 2013-01-24 19:26:09.000000000 +0000 +++ exiflow-0.4.5.16/exiflow/exigui.py 2014-02-17 23:17:48.000000000 +0000 @@ -4,7 +4,7 @@ """ A nice PyGTK GUI for the exiflow tool collection. """ -__revision__ = "$Id: exigui.py 392 2013-01-23 00:52:36Z sleif $" +__revision__ = "$Id$" import os import sys @@ -28,7 +28,7 @@ gladefile = os.path.splitext(__file__)[0] + ".glade" -class WritableTextView: +class WritableTextView(object): """ Provide a file object that writes to a GTK textview. """ @@ -153,6 +153,7 @@ level=logging.INFO) self.batch_scripts = [] self.batch_tmpdir = "" + self.batch_target = "" self.window.connect("map_event", self.batch_run) def _make_sensitive(self, name): @@ -182,12 +183,14 @@ def on_button_exiimport_browse_importdir_clicked(self, *dummy): """ Callback for the exiimport's "browse importdir" button. """ dummy = Directorychooser1(self.window, - self.wtree.get_widget("exiimport_importdir_entry").set_text) + self.wtree.get_widget( + "exiimport_importdir_entry").set_text) def on_button_exiimport_browse_targetdir_clicked(self, *dummy): """ Callback for the exiimport's "browse targetdir" button. """ dummy = Directorychooser1(self.window, - self.wtree.get_widget("exiimport_targetdir_entry").set_text) + self.wtree.get_widget( + "exiimport_targetdir_entry").set_text) @staticmethod def on_info1_activate(*dummy): @@ -411,21 +414,24 @@ self.set_text("exiimport_targetdir_entry", self.batch_target) for subdir in os.listdir(self.batch_tmpdir): target_subdir = subdir - while os.path.exists(os.path.join(self.batch_target, target_subdir)): - logger.warning("%s already exists!", - os.path.join(self.batch_target, target_subdir)) + while os.path.exists(os.path.join(self.batch_target, + target_subdir)): + logger.warning("%s already exists!", + os.path.join(self.batch_target, + target_subdir)) target_subdir += "+" - logger.info("Moving %s into target directory %s", - subdir, os.path.join(self.batch_target, target_subdir)) + logger.info("Moving %s into target directory %s", subdir, + os.path.join(self.batch_target, target_subdir)) try: shutil.move(os.path.join(self.batch_tmpdir, subdir), os.path.join(self.batch_target, target_subdir)) except shutil.Error, msg: logger.error("ERROR: %s", msg) for rownum in range(0, len(self.liststore)): - self.liststore[rownum][0] = self.liststore[rownum][0].\ - replace(os.path.join(self.batch_tmpdir, subdir),\ - os.path.join(self.batch_target, target_subdir)) + self.liststore[rownum][0] = \ + self.liststore[rownum][0].replace( + os.path.join(self.batch_tmpdir, subdir), + os.path.join(self.batch_target, target_subdir)) return 0 @@ -480,7 +486,7 @@ win1.set_text("exirename_cam_id_entry", options.cam_id) if options.artist_initials: win1.set_active("exirename_artist_initials_entry_button_custom") - win1.set_text("exirename_artist_initials_entry", + win1.set_text("exirename_artist_initials_entry", options.artist_initials) if options.with_time: win1.set_active("exirename_include_timestamp_checkbutton") @@ -490,13 +496,13 @@ win1.batch_scripts = options.batch_order.split(',') if options.batch_tmpdir and "exiimport" in win1.batch_scripts: if not options.mount or not options.target: - print( "Wrong syntax. Missing --mount or --target\n" + print("Wrong syntax. Missing --mount or --target\n" + parser.format_help()) win1.batch_scripts = [] win1.batch_tmpdir = tempfile.mkdtemp(dir=options.batch_tmpdir) win1.batch_target = options.target win1.set_text("exiimport_targetdir_entry", win1.batch_tmpdir) - + gtk.main() return 0 diff -Nru exiflow-0.4.5.15/exiflow/exiimport.py exiflow-0.4.5.16/exiflow/exiimport.py --- exiflow-0.4.5.15/exiflow/exiimport.py 2013-01-24 19:26:09.000000000 +0000 +++ exiflow-0.4.5.16/exiflow/exiimport.py 2014-02-17 23:17:48.000000000 +0000 @@ -5,7 +5,7 @@ Import files from given directories to your photo folder. Optionally unmounts source media after successfull import. """ -__revision__ = "$Id: exiimport.py 390 2013-01-22 22:17:39Z rompe $" +__revision__ = "$Id$" import os import sys @@ -27,8 +27,8 @@ # Parse command line. parser = optparse.OptionParser() parser.add_option("-m", "--mount", dest="mount", - help="Mountpoint of directory to import. Corresponds" - " to %m in the gnome-volume-manager config dialog.") + help="Mountpoint of directory to import. Corresponds" + " to %m in the gnome-volume-manager config dialog.") parser.add_option("-t", "--target", dest="target", help="Target directory. A subdirectory will be created" " in this directory.") diff -Nru exiflow-0.4.5.15/exiflow/exiperson.py exiflow-0.4.5.16/exiflow/exiperson.py --- exiflow-0.4.5.15/exiflow/exiperson.py 2013-01-24 19:26:09.000000000 +0000 +++ exiflow-0.4.5.16/exiflow/exiperson.py 2014-02-17 23:17:48.000000000 +0000 @@ -11,7 +11,7 @@ Exiftool documentation for information about possible names. """ -__revision__ = "$Id: exiperson.py 391 2013-01-23 00:50:45Z sleif $" +__revision__ = "$Id$" import sys import logging @@ -22,7 +22,7 @@ def personalize_file(filename, personals, options_section_personals, - forced_personals): + forced_personals): """ Personalize an image using data from the dictionary "personals". The optional "forced_personals" override all other personals. @@ -128,8 +128,8 @@ break # Note to programmer: # The [:] is needed to get a slice copy instead of a reference. - personalize_file(filename, defaultpersonals[:], \ - options_section_personals[:], forced_personals) + personalize_file(filename, defaultpersonals[:], + options_section_personals[:], forced_personals) if __name__ == "__main__": diff -Nru exiflow-0.4.5.15/exiflow/exirename.py exiflow-0.4.5.16/exiflow/exirename.py --- exiflow-0.4.5.15/exiflow/exirename.py 2013-01-15 22:59:54.000000000 +0000 +++ exiflow-0.4.5.16/exiflow/exirename.py 2014-02-17 23:17:48.000000000 +0000 @@ -54,7 +54,7 @@ *000.jpg of high quality. """ -__revision__ = "$Id: exirename.py 382 2013-01-15 21:51:58Z rompe $" +__revision__ = "$Id$" import os import re @@ -114,13 +114,13 @@ def rename_file(filename, my_filelist, with_time, cam_id=None, - artist_initials=None): + artist_initials=None): """ Rename filename and return the newly generated name without dir. """ logger = logging.getLogger("exirename.rename_file") - match = re.match("^(\d{8})(-(\d{6}))?-(.{3})(\d{4})-" - "((.{2})(.{3}))(\.[^.]*)$", + match = re.match("^(\\d{8})(-(\\d{6}))?-(.{3})(\\d{4})-" + "((.{2})(.{3}))(\\.[^.]*)$", os.path.basename(filename)) # differentiate between getting values from existing filenames or getting # initial values from exif and config file @@ -143,8 +143,8 @@ if with_time: date += "-" + image_time if cam_id is None or artist_initials is None: - new_cam_id, new_artist_initials = configfile.get_options("cameras", - model, ("cam_id", "artist_initials")) + new_cam_id, new_artist_initials = configfile.get_options( + "cameras", model, ("cam_id", "artist_initials")) cam_id = cam_id or new_cam_id artist_initials = artist_initials or new_artist_initials number, revision, extension = get_new_filename_parts(filename, @@ -156,11 +156,11 @@ "wrong length. cam_id should be 3 characters and is " "currently set to '%s', artist_initials should be 2 " "characters and is set to '%s'. " - "Skipping %s." % (cam_id, artist_initials, filename)) + "Skipping %s.", cam_id, artist_initials, filename) return os.path.basename(filename) - newbasename = date + "-" + cam_id + number + "-" + artist_initials + \ - revision + extension + newbasename = (date + "-" + cam_id + number + "-" + artist_initials + + revision + extension) newname = os.path.join(os.path.dirname(filename), newbasename) if filename == newname: raise IOError("Filename does not change.") diff -Nru exiflow-0.4.5.15/exiflow/filelist.py exiflow-0.4.5.16/exiflow/filelist.py --- exiflow-0.4.5.15/exiflow/filelist.py 2013-01-15 22:59:54.000000000 +0000 +++ exiflow-0.4.5.16/exiflow/filelist.py 2014-02-17 23:17:48.000000000 +0000 @@ -5,7 +5,7 @@ Generate lists of files given as names or searched in directories and provide an iterable interface to them. """ -__revision__ = "$Id: filelist.py 357 2012-07-16 20:48:14Z rompe $" +__revision__ = "$Id$" import os import time @@ -13,7 +13,7 @@ from . import configfile -class Filelist: +class Filelist(object): """ An iterable class that hosts information about files @@ -75,9 +75,9 @@ image_extensions = settings.get("all", "image_extensions").split() unwanted_files = settings.get("all", "unwantend_files").split() basefilename = os.path.basename(filename).lower() - if (self._process_unknown_types \ - or os.path.splitext(basefilename)[1] in image_extensions) \ - and not basefilename in unwanted_files: + if ((self._process_unknown_types + or os.path.splitext(basefilename)[1] in image_extensions) + and not basefilename in unwanted_files): self._files.append(filename) filestat = os.stat(filename) self._filestats[filename] = filestat diff -Nru exiflow-0.4.5.15/exiflow/gthumb.py exiflow-0.4.5.16/exiflow/gthumb.py --- exiflow-0.4.5.15/exiflow/gthumb.py 2013-01-15 22:59:54.000000000 +0000 +++ exiflow-0.4.5.16/exiflow/gthumb.py 2014-02-17 23:17:48.000000000 +0000 @@ -4,7 +4,7 @@ """ Handle reading and writing gthumb comment files. """ -__revision__ = "$Id: gthumb.py 358 2012-07-16 20:51:40Z rompe $" +__revision__ = "$Id$" import os import re @@ -12,7 +12,7 @@ import xml.dom.minidom -class Gthumb: +class Gthumb(object): """ A class that handles reading and writing gthumb comment files for an image file. @@ -27,7 +27,7 @@ self.commentsdir = os.path.join(os.path.dirname(self.filename), ".comments") self.commentsfile = os.path.join(self.commentsdir, - os.path.basename(self.filename) + ".xml") + os.path.basename(self.filename) + ".xml") def read(self): """ @@ -42,7 +42,7 @@ "Copyright" => "Note" line: "^Copyright::.*" "CopyrightNotice" => "Note" line: "^CopyrightNotice::.*" "UserComment" => "Note" line: "^UserComment::.*" - "ImageDescription" => "Note" free text without "^\w+::" + "ImageDescription" => "Note" free text without "^\\w+::" "Keywords" => "Keywords" comma separated list "Location" => "Place" "DateTimeOriginal" => "Time" in seconds since 1970-01-01 @@ -70,7 +70,7 @@ self.fields[gthumb_to_exif[key]] = mydata[key] if "Note" in mydata: note = [] - myregex = re.compile("(\w+)::(.*)$") + myregex = re.compile("(\\w+)::(.*)$") for line in mydata["Note"].split("\n"): match = myregex.match(line) if match: diff -Nru exiflow-0.4.5.15/exiflow/__init__.py exiflow-0.4.5.16/exiflow/__init__.py --- exiflow-0.4.5.15/exiflow/__init__.py 2013-01-15 22:59:54.000000000 +0000 +++ exiflow-0.4.5.16/exiflow/__init__.py 2014-02-17 22:57:08.000000000 +0000 @@ -4,4 +4,4 @@ This file is intentionally left blank. It exists solely to mark it's directory as a module. """ -__revision__ = "$Id: __init__.py 352 2012-05-06 23:01:31Z rompe $" +__revision__ = "$Id$" diff -Nru exiflow-0.4.5.15/PKG-INFO exiflow-0.4.5.16/PKG-INFO --- exiflow-0.4.5.15/PKG-INFO 2014-02-17 21:02:03.000000000 +0000 +++ exiflow-0.4.5.16/PKG-INFO 2014-02-18 00:36:38.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: Exiflow -Version: 0.4.5.15 +Version: 0.4.5.16 Summary: A set of tools including a little GUI to provide a complete digital photo workflow for Unixes, using EXIF headers as the central information repository. Home-page: http://exiflow.org/ Author: Ulf Rompe, Sebastian Berthold diff -Nru exiflow-0.4.5.15/release.sh exiflow-0.4.5.16/release.sh --- exiflow-0.4.5.15/release.sh 2014-02-18 00:39:21.000000000 +0000 +++ exiflow-0.4.5.16/release.sh 2014-02-18 00:39:21.000000000 +0000 @@ -1,6 +1,10 @@ #!/bin/bash set -e -DISTRIBUTIONS="lucid maverick natty oneiric precise quantal raring saucy trusty" +# +# adopt version in ./exiflow/exigui.glade, ./setup.py +# set Ubuntu versions in DISTRIBUTION +# +DISTRIBUTIONS="lucid precise quantal raring saucy trusty" if [ ${USER} == "ulf" ]; then export GPGKEY=643D8C7A export DEBEMAIL='launchpad.net@rompe.org' @@ -17,12 +21,14 @@ read -p "Press Ctrl-C to stop, Enter to continue." bla else dch -v ${version}-1 "Release Exiflow ${version}." - svn commit -m "Update debian changelog for ${version}." debian/changelog + git commit -m "Update debian changelog for ${version}." debian/changelog + git push fi python setup.py bdist_rpm # For Sourceforge python setup.py sdist cp dist/Exiflow-${version}.tar.gz dist/exiflow_${version}.orig.tar.gz -svn export . dist/exiflow-${version} +mkdir dist/exiflow-${version}/ +git archive master | tar -x -C dist/exiflow-${version}/ cd dist/exiflow-${version} for dist in ${DISTRIBUTIONS}; do dch --distribution ${dist} -b -v ${version}-1ppa1~${dist}1 "Upload Exiflow ${version} for ${dist}." diff -Nru exiflow-0.4.5.15/setup.py exiflow-0.4.5.16/setup.py --- exiflow-0.4.5.15/setup.py 2014-02-17 20:56:12.000000000 +0000 +++ exiflow-0.4.5.16/setup.py 2014-02-18 00:20:57.000000000 +0000 @@ -10,7 +10,7 @@ setup(name='Exiflow', install_requires=["glade2"], - version='0.4.5.15', + version='0.4.5.16', packages=['exiflow'], scripts=["exiassign", "exiconvert", "exigate", "exigui", "exiimport", "exiperson", "exirename"], diff -Nru exiflow-0.4.5.15/tests/NikonD70.py exiflow-0.4.5.16/tests/NikonD70.py --- exiflow-0.4.5.15/tests/NikonD70.py 2013-01-15 22:59:54.000000000 +0000 +++ exiflow-0.4.5.16/tests/NikonD70.py 2014-02-17 22:57:08.000000000 +0000 @@ -5,7 +5,7 @@ Make sure to ignore "Directory" and "FileModifyDate" when using this for comparison purposes.. """ -__revision__ = "$Id: NikonD70.py 349 2012-05-06 22:24:26Z rompe $" +__revision__ = "$Id$" fields = {'AFAperture': u'4.5', 'AFAreaMode': u'Single Area', diff -Nru exiflow-0.4.5.15/tests/test_exif.py exiflow-0.4.5.16/tests/test_exif.py --- exiflow-0.4.5.15/tests/test_exif.py 2013-01-15 22:59:54.000000000 +0000 +++ exiflow-0.4.5.16/tests/test_exif.py 2014-02-17 22:57:08.000000000 +0000 @@ -4,7 +4,7 @@ """ Unit tests for exif.py """ -__revision__ = "$Id: test_exif.py 362 2012-07-16 20:58:52Z rompe $" +__revision__ = "$Id$" import shutil diff -Nru exiflow-0.4.5.15/tests/test_exiimport.py exiflow-0.4.5.16/tests/test_exiimport.py --- exiflow-0.4.5.15/tests/test_exiimport.py 2013-01-24 19:26:09.000000000 +0000 +++ exiflow-0.4.5.16/tests/test_exiimport.py 2014-02-17 22:57:08.000000000 +0000 @@ -4,7 +4,7 @@ """ Unit tests for exiimport.py """ -__revision__ = "$Id: test_exiimport.py 390 2013-01-22 22:17:39Z rompe $" +__revision__ = "$Id$" import shutil diff -Nru exiflow-0.4.5.15/tests/test_exirename.py exiflow-0.4.5.16/tests/test_exirename.py --- exiflow-0.4.5.15/tests/test_exirename.py 2013-01-15 22:59:54.000000000 +0000 +++ exiflow-0.4.5.16/tests/test_exirename.py 2014-02-17 22:57:08.000000000 +0000 @@ -4,7 +4,7 @@ """ Unit tests for exirename.py """ -__revision__ = "$Id: test_exirename.py 378 2013-01-09 00:23:22Z rompe $" +__revision__ = "$Id$" import shutil