Hello community, here is the log from the commit of package dispcalGUI for openSUSE:Factory checked in at 2012-10-16 11:29:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dispcalGUI (Old) and /work/SRC/openSUSE:Factory/.dispcalGUI.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dispcalGUI", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/dispcalGUI/dispcalGUI.changes 2012-09-25 09:41:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dispcalGUI.new/dispcalGUI.changes 2012-10-16 11:29:15.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Oct 05 17:05:00 UTC 2012 - dispcal...@hoech.net + +- update to 1.1.2.1: see README.html#changelog-1.1.2.1 + +------------------------------------------------------------------- Old: ---- dispcalGUI-1.1.0.0.tar.gz New: ---- dispcalGUI-1.1.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dispcalGUI.spec ++++++ --- /var/tmp/diff_new_pack.WYT69c/_old 2012-10-16 11:29:16.000000000 +0200 +++ /var/tmp/diff_new_pack.WYT69c/_new 2012-10-16 11:29:16.000000000 +0200 @@ -24,15 +24,15 @@ Summary: A graphical front-end for display calibration and profiling using Argyll CMS License: GPL-3.0+ +Group: Applications/Multimedia Name: dispcalGUI -Version: 1.1.0.0 +Version: 1.1.2.1 Release: 0 Source0: http://%{name}.hoech.net/download/%{name}-%version.tar.gz Source1: copyright Url: http://dispcalgui.hoech.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?mandriva_version} > 0 -Group: Graphics BuildRequires: gcc BuildRequires: libpython-devel BuildRequires: udev @@ -46,7 +46,6 @@ Requires: wxPythonGTK >= %{wx_minversion} %else %if 0%{?suse_version} > 0 -Group: Productivity/Graphics/Other BuildRequires: gcc BuildRequires: python-devel BuildRequires: udev @@ -58,7 +57,6 @@ %py_requires %else %if 0%{?fedora_version} > 0 || 0%{?rhel_version} > 0 || 0%{?centos_version} > 0 -Group: Applications/Multimedia BuildRequires: gcc BuildRequires: libX11-devel BuildRequires: libXinerama-devel ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.WYT69c/_old 2012-10-16 11:29:16.000000000 +0200 +++ /var/tmp/diff_new_pack.WYT69c/_new 2012-10-16 11:29:16.000000000 +0200 @@ -1,5 +1,5 @@ -dispcalgui (1.1.0.0) stable; urgency=low +dispcalgui (1.1.2.1) stable; urgency=low - * Version 1.1.0.0 + * Version 1.1.2.1 - -- Florian Höch <dispcal...@hoech.net> Sat, 15 Sep 2012 13:54:02 +0100 + -- Florian Höch <dispcal...@hoech.net> Fri, 05 Oct 2012 17:05:00 +0100 ++++++ debian.rules ++++++ --- /var/tmp/diff_new_pack.WYT69c/_old 2012-10-16 11:29:16.000000000 +0200 +++ /var/tmp/diff_new_pack.WYT69c/_new 2012-10-16 11:29:16.000000000 +0200 @@ -19,7 +19,7 @@ # The DESTDIR Has To Be Exactly /usr/src/packages/BUILD/debian/<nameOfPackage> export name=dispcalGUI -export version=1.1.0.0 +export version=1.1.2.1 export DEB_BUILD_ROOT=/usr/src/packages/BUILD/debian/dispcalgui export install_prefix=/usr export install_exec_prefix=/usr ++++++ dispcalGUI-1.1.0.0.tar.gz -> dispcalGUI-1.1.2.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/PKG-INFO new/dispcalGUI-1.1.2.1/PKG-INFO --- old/dispcalGUI-1.1.0.0/PKG-INFO 2012-09-15 23:03:31.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/PKG-INFO 2012-10-05 21:16:11.000000000 +0200 @@ -1,12 +1,12 @@ Metadata-Version: 1.1 Name: dispcalGUI -Version: 1.1.0.0 +Version: 1.1.2.1 Summary: A graphical front-end for display calibration and profiling using Argyll CMS Home-page: http://dispcalGUI.hoech.net/ Author: Florian Hoech Author-email: dispcal...@hoech.net License: GPL v3 -Download-URL: http://dispcalGUI.hoech.net/dispcalGUI-1.1.0.0.tar.gz +Download-URL: http://dispcalGUI.hoech.net/dispcalGUI-1.1.2.1.tar.gz Description: Calibrates and characterizes display devices using a hardware sensor, driven by the open source color management system Argyll CMS. Supports multi-display setups and a variety of available settings like diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/README.html new/dispcalGUI-1.1.2.1/README.html --- old/dispcalGUI-1.1.0.0/README.html 2012-09-15 21:19:39.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/README.html 2012-10-05 21:10:05.000000000 +0200 @@ -25,8 +25,8 @@ <div id="intro"> <div id="friendlybox"> <div id="get"> - <h2>1.1</h2> - <p>2012-09-15 15:38 UTC</p> + <h2>1.1.2.1</h2> + <p>2012-10-05 19:04 UTC</p> <ul> <li class="download"><a href="#download">Get dispcalGUI</a></li> <li class="requirements"><a href="#requirements">System requirements</a></li> @@ -360,7 +360,7 @@ <p>You need to have a working Python installation and all <a href="#requirements-source">requirements</a>.</p> <p><a href="http://dispcalGUI.hoech.net/download/dispcalGUI.tar.gz";>Source Tarball</a></p> <p> - Alternatively, if you don't mind trying out development code, <a href="http://sourceforge.net/p/dispcalgui/code/";>browse the <acronym title="Subversion">SVN<sup><a href="#definition_SVN">[8]</a></sup></acronym> repository of the latest development version</a> (or do a full checkout using <code>svn checkout svn+ssh://fho...@svn.code.sf.net/p/dispcalgui/code/trunk dispcalgui</code>). But please note that the development code might contain bugs or not run at all, or only on some platform(s). Use at your own risk. + Alternatively, if you don't mind trying out development code, <a href="http://sourceforge.net/p/dispcalgui/code/";>browse the <acronym title="Subversion">SVN<sup><a href="#definition_SVN">[8]</a></sup></acronym> repository of the latest development version</a> (or do a full checkout using <code>svn checkout svn://svn.code.sf.net/p/dispcalgui/code/trunk dispcalgui</code>). But please note that the development code might contain bugs or not run at all, or only on some platform(s). Use at your own risk. </p> </div> </li> @@ -534,7 +534,7 @@ <ol> <li>Open a shell.</li> - <li><code>cd</code> into the source directory (e.g. <code>dispcalGUI-1.1</code> or <code>dispcalgui</code>).</li> + <li><code>cd</code> into the source directory (e.g. <code>dispcalGUI-1.1.2.1</code> or <code>dispcalgui</code>).</li> <li>If you use a version from the SVN repository, run <code>python setup.py</code> to create the version file.</li> <li>Run <code>python setup.py build_ext -i</code> to build the extension modules (you may be able to skip this step on Linux and Mac OS X as the source already includes compiled versions of the extension modules)</li> </ol> @@ -1454,7 +1454,7 @@ Roberto Quintero (spanish translation), Tommaso Schiavinotto (italian translation)</p> - <p>Recent donors: Eugeniy Yurov, Hans Cremers, George Pop, Michael Gestgrasser, Stefan Pallari, Oliver Hoefele, Kyle Winfree, Alexander Mitchell, Juho Turunen, Jon Sands, Evgueni Ivanov, Riccardo Mandarano, Roman Romenskiy, Myron Blume, WTPM van Vucht, Philip Tobias, Richard Luney, Matthias Klausing, M E M van Ineveld, Patryk Bajer, Gregor Kofler, Richard Egger, Michael Dougherty, Christian Spyr, Konstantin Pyanzin</p> + <p>Recent donors: Andrew Hunter, Thomas Voigt, Александр Ольховский, Eugeniy Yurov, Hans Cremers, George Pop, Michael Gestgrasser, Stefan Pallari, Oliver Hoefele, Kyle Winfree, Alexander Mitchell, Juho Turunen, Jon Sands, Evgueni Ivanov, Riccardo Mandarano, Roman Romenskiy, Myron Blume, WTPM van Vucht, Philip Tobias, Richard Luney, Matthias Klausing, M E M van Ineveld, Patryk Bajer, Gregor Kofler, Richard Egger, Michael Dougherty, Christian Spyr, Konstantin Pyanzin</p> <p>And everyone who sent me feedback or bug reports, suggested features, or simply uses dispcalGUI.</p> @@ -1465,8 +1465,25 @@ <div id="changelog"> <h2>Version history / changelog</h2> - <!-- 2012-09-15 15:38 (UTC) 1.1 --> + <!-- 2012-10-05 19:04 (UTC) 1.1.2.1 --> <dl> + <dt id="changelog-1.1.2.1">2012-10-05 19:04 (UTC) 1.1.2.1</dt> + <dd> + <h3>1.1.2.1</h3> + <h4>Changed in this release:</h4> + <ul> + <li>Disable source profile selector in advanced gamut mapping options if not atleast one of perceptual or saturation checkboxes is selected.</li> + <li>Only show a warning if an incompatible colorimeter correction is explicitly selected via the filebrowser.</li> + <li>Show a less cryptic error message if an invalid file is selected when importing colorimeter corrections from other display profiling software.</li> + </ul> + <h4>Fixed in this release:</h4> + <ul> + <li>Whitepoint color temperature is an integer, not a float. This fixes calibration settings being detected as changed when they actually haven't.</li> + <li>Worked around a bug in wxPython where controls in a hidden window react to focus events. This fixes the sporadic hang after calibration measurements during a “Calibrate & profile” run.</li> + <li>Linux, Mac OS X: Unhandled exception when trying to import colorimeter corrections from other display profiling software and selecting a file with '.txt' extension.</li> + </ul> + </dd> + <dt id="changelog-1.1">2012-09-15 15:38 (UTC) 1.1</dt> <dd> <h3>1.1</h3> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/dispcalGUI/__version__.py new/dispcalGUI-1.1.2.1/dispcalGUI/__version__.py --- old/dispcalGUI-1.1.0.0/dispcalGUI/__version__.py 2012-09-15 23:03:28.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/dispcalGUI/__version__.py 2012-10-05 21:16:07.000000000 +0200 @@ -1,7 +1,7 @@ # generated by setup.py -BUILD_DATE = '2012-09-15T21:03:28.872628Z' -LASTMOD = '2012-09-15T15:54:02.408104Z' -VERSION = (1, 1, 0, 0) -VERSION_BASE = (1, 1, 0, 0) -VERSION_STRING = '1.1.0.0' +BUILD_DATE = '2012-10-05T19:16:07.819009Z' +LASTMOD = '2012-10-05T19:05:00.736566Z' +VERSION = (1, 1, 2, 1) +VERSION_BASE = (1, 1, 2, 1) +VERSION_STRING = '1.1.2.1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/dispcalGUI/argyll_instruments.json new/dispcalGUI-1.1.2.1/dispcalGUI/argyll_instruments.json --- old/dispcalGUI-1.1.0.0/dispcalGUI/argyll_instruments.json 2012-09-15 21:19:38.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/dispcalGUI/argyll_instruments.json 2012-10-02 18:59:24.000000000 +0200 @@ -71,12 +71,28 @@ "sensor_cal": true, "skip_sensor_cal": null }, - "i1 Display": { + "i1 Display": { // Argyll 1.3.5 and earlier "spectral": false, "adaptive_mode": false, "highres_mode": false, "projector_mode": false, - "sensor_cal": false, // FIXME: Only i1 Display 2 + "sensor_cal": false, + "skip_sensor_cal": false + }, + "i1 Display 1": { // Argyll 1.3.6 and newer + "spectral": false, + "adaptive_mode": false, + "highres_mode": false, + "projector_mode": false, + "sensor_cal": true, + "skip_sensor_cal": false + }, + "i1 Display 2": { // Argyll 1.3.6 and newer + "spectral": false, + "adaptive_mode": false, + "highres_mode": false, + "projector_mode": false, + "sensor_cal": false, "skip_sensor_cal": false // i1 Display 2 instrument access fails // when using -N option to skip automatic sensor calibration // (dispread -D9 output: "Setting no-sensor_calibrate failed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/dispcalGUI/config.py new/dispcalGUI-1.1.2.1/dispcalGUI/config.py --- old/dispcalGUI-1.1.0.0/dispcalGUI/config.py 2012-09-15 21:19:38.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/dispcalGUI/config.py 2012-10-05 21:10:04.000000000 +0200 @@ -535,7 +535,7 @@ "trc.type": "g", "update_check": 1, "use_separate_lut_access": 0, - "whitepoint.colortemp": 5000.0, + "whitepoint.colortemp": 5000, "whitepoint.colortemp.locus": "t", "whitepoint.x": 0.345741, "whitepoint.y": 0.358666 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/dispcalGUI/dispcalGUI.py new/dispcalGUI-1.1.2.1/dispcalGUI/dispcalGUI.py --- old/dispcalGUI-1.1.0.0/dispcalGUI/dispcalGUI.py 2012-09-15 21:19:38.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/dispcalGUI/dispcalGUI.py 2012-10-05 21:15:44.000000000 +0200 @@ -133,13 +133,13 @@ from util_str import (ellipsis, safe_str, safe_unicode, strtr, universal_newlines, wrap) import util_x -from worker import (Error, FilteredStream, LineCache, Worker, check_cal_isfile, - check_create_dir, check_file_isfile, check_profile_isfile, - check_set_argyll_bin, get_argyll_util, get_options_from_cal, - get_options_from_profile, get_options_from_ti3, - make_argyll_compatible_path, normalize_manufacturer_name, - parse_argument_string, printcmdline, set_argyll_bin, - show_result_dialog) +from worker import (Error, FilteredStream, LineCache, Warn, Worker, + check_cal_isfile, check_create_dir, check_file_isfile, + check_profile_isfile, check_set_argyll_bin, get_argyll_util, + get_options_from_cal, get_options_from_profile, + get_options_from_ti3, make_argyll_compatible_path, + normalize_manufacturer_name, parse_argument_string, + printcmdline, set_argyll_bin, show_result_dialog) try: from wxLUTViewer import LUTFrame except ImportError: @@ -775,12 +775,13 @@ self.gamap_src_viewcond_ctrl.SetStringSelection( lang.getstr("gamap.viewconds.mt")) self.gamap_src_viewcond_handler() - self.gamap_perceptual_cb.Enable(p) + self.gamap_perceptual_cb.Enable() self.gamap_perceptual_intent_ctrl.Enable(self.gamap_perceptual_cb.GetValue()) - self.gamap_saturation_cb.Enable(p) + self.gamap_saturation_cb.Enable() self.gamap_saturation_intent_ctrl.Enable(self.gamap_saturation_cb.GetValue()) c = self.gamap_perceptual_cb.GetValue() or \ self.gamap_saturation_cb.GetValue() + self.gamap_profile.Enable(c) self.gamap_src_viewcond_ctrl.Enable(p and c) self.gamap_out_viewcond_ctrl.Enable(p and c) self.gamap_default_intent_ctrl.Enable(p and c) @@ -2366,7 +2367,7 @@ adjustment controls, which do not cause a 'calibration changed' event. """ - if not self.updatingctrls: + if not self.updatingctrls and self.IsShownOnScreen(): # update_controls which is called from cal_changed might cause a # another cal_changed call, in which case we can skip it if debug: @@ -2595,7 +2596,8 @@ self.calpanel.Thaw() self.update_scrollbars() - def update_colorimeter_correction_matrix_ctrl_items(self, force=False): + def update_colorimeter_correction_matrix_ctrl_items(self, force=False, + warn_on_mismatch=False): """ Show the currently selected correction matrix and list all files in ccmx directory below @@ -2701,13 +2703,7 @@ self.ccmx_item_paths.insert(0, ccmx[1]) if ccmx[0] != "AUTO": index = 2 - if len(ccmx) > 1 and ccmx[1] and ccmx[1] not in self.ccmx_item_paths: - # CCMX does not match the currently selected instrument, - # don't use - ccmx = [""] - show_result_dialog(Error(lang.getstr("colorimeter_correction.instrument_mismatch")), self) if ccmx[0] == "AUTO": - index = 1 display_name = self.worker.get_display_name(False, True) if self.worker.instrument_supports_ccss(): # Prefer CCSS @@ -2716,6 +2712,15 @@ ccmx[1] = self.ccmx_mapping.get("%s\0%s" % (self.worker.get_instrument_name(), display_name), "") + if (self.worker.instrument_can_use_ccxx() and len(ccmx) > 1 and + ccmx[1] and ccmx[1] not in self.ccmx_item_paths): + # CCMX does not match the currently selected instrument, + # don't use + ccmx = [""] + if warn_on_mismatch: + show_result_dialog(Warn(lang.getstr("colorimeter_correction.instrument_mismatch")), self) + elif ccmx[0] == "AUTO": + index = 1 if ccmx[1]: items[1] += " (%s: %s)" % (types.get(os.path.splitext(ccmx[1])[1].lower()[1:]), self.ccmx_cached_descriptors[ccmx[1]]) @@ -3848,7 +3853,7 @@ def whitepoint_ctrl_handler(self, event, cal_changed=True): if event.GetId() == self.whitepoint_colortemp_textctrl.GetId() and ( self.whitepoint_ctrl.GetSelection() != 1 or - str(float(getcfg("whitepoint.colortemp"))) == + str(int(getcfg("whitepoint.colortemp"))) == self.whitepoint_colortemp_textctrl.GetValue()): event.Skip() return @@ -3946,7 +3951,7 @@ if getcfg("whitepoint.colortemp") == v and not \ getcfg("whitepoint.x") and not getcfg("whitepoint.y"): cal_changed = False - setcfg("whitepoint.colortemp", v) + setcfg("whitepoint.colortemp", int(v)) setcfg("whitepoint.x", None) setcfg("whitepoint.y", None) if (event.GetId() == self.whitepoint_ctrl.GetId() and @@ -5340,8 +5345,7 @@ instrument += " (%s)" % "/".join(mode) ccmx = "None" - if self.worker.argyll_version >= [1, 3, 0] and \ - not self.worker.get_instrument_features().get("spectral"): + if self.worker.instrument_can_use_ccxx(): ccmx = getcfg("colorimeter_correction_matrix_file").split(":", 1) if len(ccmx) > 1 and ccmx[1]: ccmxpath = ccmx[1] @@ -6488,7 +6492,7 @@ if (getcfg("colorimeter_correction_matrix_file").split(":")[0] != "AUTO" or path not in self.ccmx_cached_paths): setcfg("colorimeter_correction_matrix_file", ":" + path) - self.update_colorimeter_correction_matrix_ctrl_items() + self.update_colorimeter_correction_matrix_ctrl_items(warn_on_mismatch=True) def colorimeter_correction_web_handler(self, event): """ Check the web for cccmx or ccss files """ @@ -7009,12 +7013,16 @@ i1d3ccss = get_argyll_util("i1d3ccss") if i1d3ccss and choice == wx.ID_OK: # Automatically import X-Rite .edr files - result = i1d3 = self.worker.import_edr() + result = self.worker.import_edr() + if not isinstance(result, Exception): + i1d3 = result spyd4 = False spyd4en = get_argyll_util("spyd4en") if spyd4en and choice == wx.ID_OK: # Automatically import Spyder4 calibrations - result = spyd4 = self.worker.import_spyd4cal() + result = self.worker.import_spyd4cal() + if not isinstance(result, Exception): + spyd4 = result # Import iColorDisplay device corrections or let the user choose defaultDir = "" defaultFile = "" @@ -7034,7 +7042,7 @@ if defaultDir and os.path.isdir(defaultDir): # iColorDisplay found defaultFile = "DeviceCorrections.txt" - elif i1d3ccss: + elif i1d3ccss and not i1d3: # Look for *.edr files if sys.platform == "win32": defaultDir = os.path.join(getenvu("PROGRAMFILES", ""), @@ -7052,32 +7060,26 @@ "ColorMunki Display")) if paths: defaultDir = paths[-1] - defaultFile = "" - elif spyd4en: + elif spyd4en and not spyd4: # Look for dccmtr.dll if sys.platform == "win32": paths = glob.glob(os.path.join(getenvu("PROGRAMFILES", ""), "Datacolor", "Spyder4*", "dccmtr.dll")) elif sys.platform == "darwin": - # TODO: Check if these guessed paths are correct? (probably not) - paths = glob.glob(os.path.join(os.path.sep, "Applications", - "Spyder4*", "Spyder4*.app", - "Contents", "MacOS", - "dccmtr.lib")) - paths += glob.glob(os.path.join(os.path.sep, "Volumes", - "Datacolor", "Data", - "setup.exe")) + # Look for setup.exe on CD-ROM + paths = glob.glob(os.path.join(os.path.sep, "Volumes", + "Datacolor", "Data", + "setup.exe")) paths += glob.glob(os.path.join(os.path.sep, "Volumes", "Datacolor_ISO", "Data", "setup.exe")) if paths: - defaultDir = paths[-1] - defaultFile = "" + defaultDir, defaultFile = os.path.split(paths[-1]) if defaultDir and os.path.isdir(defaultDir): if choice == wx.ID_OK: path = os.path.join(defaultDir, defaultFile) - if not path or not os.path.isfile(path): + if (not path or not os.path.isfile(path)) and not (i1d3 or spyd4): dlg = wx.FileDialog(self, lang.getstr("colorimeter_correction.import.choose"), defaultDir=defaultDir, @@ -7129,9 +7131,9 @@ safe_print(path) try: ccmx.convert_devicecorrections_to_ccmx(path, ccmx_dir) - except (WindowsError, OSError, UnicodeDecodeError, + except (OSError, UnicodeDecodeError, demjson.JSONDecodeError), exception: - result = exception + result = Error(lang.getstr("file.invalid")) else: result = icd = True elif type == "xrite": @@ -8585,7 +8587,8 @@ if o[0] in ("t", "T"): setcfg("whitepoint.colortemp.locus", o[0]) if o[1:]: - setcfg("whitepoint.colortemp", o[1:]) + setcfg("whitepoint.colortemp", + int(float(o[1:]))) setcfg("whitepoint.x", None) setcfg("whitepoint.y", None) continue diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/dispcalGUI/lang/de.json new/dispcalGUI-1.1.2.1/dispcalGUI/lang/de.json --- old/dispcalGUI-1.1.0.0/dispcalGUI/lang/de.json 2012-09-15 21:19:30.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/dispcalGUI/lang/de.json 2012-10-02 18:59:24.000000000 +0200 @@ -243,6 +243,7 @@ "error.trashcan_unavailable": "Der %s ist nicht verfügbar. Es wurden keine Dateien entfernt.", "extra_args": "Zusätzliche Befehlszeilen-Parameter setzen...", "failure": "...fehlgeschlagen!", + "file.invalid": "Datei ungültig.", "file.missing": "Die Datei „%s“ existiert nicht.", "file.notfile": "„%s“ ist keine Datei.", "file.select": "Datei auswählen", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/dispcalGUI/lang/en.json new/dispcalGUI-1.1.2.1/dispcalGUI/lang/en.json --- old/dispcalGUI-1.1.0.0/dispcalGUI/lang/en.json 2012-09-15 21:19:30.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/dispcalGUI/lang/en.json 2012-10-02 18:59:24.000000000 +0200 @@ -243,6 +243,7 @@ "error.trashcan_unavailable": "The %s is not available. No files were removed.", "extra_args": "Set additional commandline arguments...", "failure": "...failed!", + "file.invalid": "File invalid.", "file.missing": "The file “%s” does not exist.", "file.notfile": "“%s” is not a file.", "file.select": "Select file", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/dispcalGUI/lang/es.json new/dispcalGUI-1.1.2.1/dispcalGUI/lang/es.json --- old/dispcalGUI-1.1.0.0/dispcalGUI/lang/es.json 2012-09-15 21:19:30.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/dispcalGUI/lang/es.json 2012-10-02 18:59:24.000000000 +0200 @@ -243,6 +243,7 @@ "error.trashcan_unavailable": "El %s no esta disponible. No se eliminaron archivos.", "extra_args": "Establecer argumentos adicionales de línea de comandos...", "failure": "...fallado!", + "*file.invalid": "File invalid.", "file.missing": "El archivo no existe “%s” no existe.", "file.notfile": "“%s” no es un archivo.", "file.select": "Seleccionar archivo", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/dispcalGUI/lang/fr.json new/dispcalGUI-1.1.2.1/dispcalGUI/lang/fr.json --- old/dispcalGUI-1.1.0.0/dispcalGUI/lang/fr.json 2012-09-15 21:19:30.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/dispcalGUI/lang/fr.json 2012-10-02 18:59:24.000000000 +0200 @@ -243,6 +243,7 @@ "error.trashcan_unavailable": "La %s n'est pas disponible. Aucun fichier n'a été supprimé.", "extra_args": "Définir des arguments de ligne de commande supplémentaires...", "failure": "... échec !", + "*file.invalid": "File invalid.", "file.missing": "Le fichier « %s » n'existe pas.", "file.notfile": "« %s » n'est pas un fichier.", "file.select": "Sélectionnez un fichier", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/dispcalGUI/lang/it.json new/dispcalGUI-1.1.2.1/dispcalGUI/lang/it.json --- old/dispcalGUI-1.1.0.0/dispcalGUI/lang/it.json 2012-09-15 21:19:30.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/dispcalGUI/lang/it.json 2012-10-02 18:59:24.000000000 +0200 @@ -243,6 +243,7 @@ "*error.trashcan_unavailable": "The %s is not available. No files were removed.", "*extra_args": "Set additional commandline arguments...", "failure": "...fallito!", + "*file.invalid": "File invalid.", "file.missing": "Il file “%s” non esiste.", "file.notfile": "“%s” non è un file.", "*file.select": "Select file", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/dispcalGUI/lib/__init__.py new/dispcalGUI-1.1.2.1/dispcalGUI/lib/__init__.py --- old/dispcalGUI-1.1.0.0/dispcalGUI/lib/__init__.py 2012-09-15 21:19:33.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/dispcalGUI/lib/__init__.py 2012-09-29 20:38:42.000000000 +0200 @@ -0,0 +1 @@ +# \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/dispcalGUI/lib32/__init__.py new/dispcalGUI-1.1.2.1/dispcalGUI/lib32/__init__.py --- old/dispcalGUI-1.1.0.0/dispcalGUI/lib32/__init__.py 2012-09-15 21:19:33.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/dispcalGUI/lib32/__init__.py 2012-09-29 20:38:42.000000000 +0200 @@ -0,0 +1 @@ +# \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/dispcalGUI/lib32/python25/__init__.py new/dispcalGUI-1.1.2.1/dispcalGUI/lib32/python25/__init__.py --- old/dispcalGUI-1.1.0.0/dispcalGUI/lib32/python25/__init__.py 2012-09-15 21:19:33.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/dispcalGUI/lib32/python25/__init__.py 2012-09-29 20:38:42.000000000 +0200 @@ -0,0 +1 @@ +# \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/dispcalGUI/lib32/python26/__init__.py new/dispcalGUI-1.1.2.1/dispcalGUI/lib32/python26/__init__.py --- old/dispcalGUI-1.1.0.0/dispcalGUI/lib32/python26/__init__.py 2012-09-15 21:19:33.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/dispcalGUI/lib32/python26/__init__.py 2012-09-29 20:38:42.000000000 +0200 @@ -0,0 +1 @@ +# \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/dispcalGUI/lib32/python27/__init__.py new/dispcalGUI-1.1.2.1/dispcalGUI/lib32/python27/__init__.py --- old/dispcalGUI-1.1.0.0/dispcalGUI/lib32/python27/__init__.py 2012-09-15 21:19:33.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/dispcalGUI/lib32/python27/__init__.py 2012-09-29 20:38:42.000000000 +0200 @@ -0,0 +1 @@ +# \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/dispcalGUI/lib64/__init__.py new/dispcalGUI-1.1.2.1/dispcalGUI/lib64/__init__.py --- old/dispcalGUI-1.1.0.0/dispcalGUI/lib64/__init__.py 2012-09-15 21:19:32.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/dispcalGUI/lib64/__init__.py 2012-09-29 20:38:42.000000000 +0200 @@ -0,0 +1 @@ +# \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/dispcalGUI/lib64/python25/__init__.py new/dispcalGUI-1.1.2.1/dispcalGUI/lib64/python25/__init__.py --- old/dispcalGUI-1.1.0.0/dispcalGUI/lib64/python25/__init__.py 2012-09-15 21:19:32.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/dispcalGUI/lib64/python25/__init__.py 2012-09-29 20:38:42.000000000 +0200 @@ -0,0 +1 @@ +# \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/dispcalGUI/lib64/python26/__init__.py new/dispcalGUI-1.1.2.1/dispcalGUI/lib64/python26/__init__.py --- old/dispcalGUI-1.1.0.0/dispcalGUI/lib64/python26/__init__.py 2012-09-15 21:19:32.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/dispcalGUI/lib64/python26/__init__.py 2012-09-29 20:38:42.000000000 +0200 @@ -0,0 +1 @@ +# \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/dispcalGUI/lib64/python27/__init__.py new/dispcalGUI-1.1.2.1/dispcalGUI/lib64/python27/__init__.py --- old/dispcalGUI-1.1.0.0/dispcalGUI/lib64/python27/__init__.py 2012-09-15 21:19:32.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/dispcalGUI/lib64/python27/__init__.py 2012-09-29 20:38:42.000000000 +0200 @@ -0,0 +1 @@ +# \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/dispcalGUI/setup.py new/dispcalGUI-1.1.2.1/dispcalGUI/setup.py --- old/dispcalGUI-1.1.0.0/dispcalGUI/setup.py 2012-09-15 21:19:38.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/dispcalGUI/setup.py 2012-09-25 17:18:55.000000000 +0200 @@ -325,7 +325,11 @@ (os.path.join(data, "lib"), [sys.executable, sys.executable.replace(".exe", "w.exe")]), (os.path.join(data, "scripts"), - [os.path.join("scripts", name + "-apply-profiles")])] + [os.path.join("scripts", name + "-apply-profiles")]), + (os.path.join(data, "scripts"), + [os.path.join("scripts", name + "-profile-info")]), + (os.path.join(data, "scripts"), + [os.path.join("scripts", name + "-testchart-editor")])] else: data_files += [(os.path.join(data, "theme", "icons"), glob.glob(os.path.join(pydir, "theme", @@ -563,6 +567,8 @@ attrs["zip_safe"] = False else: attrs["scripts"] += [os.path.join("scripts", name)] + attrs["scripts"] += [os.path.join("scripts", name + "-profile-info")] + attrs["scripts"] += [os.path.join("scripts", name + "-testchart-editor")] if sys.platform != "darwin" and (sys.platform != "win32" or not do_py2exe): attrs["scripts"] += [os.path.join("scripts", name + "-apply-profiles")] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/dispcalGUI/wexpect.py new/dispcalGUI-1.1.2.1/dispcalGUI/wexpect.py --- old/dispcalGUI-1.1.0.0/dispcalGUI/wexpect.py 2012-09-15 21:19:38.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/dispcalGUI/wexpect.py 2012-10-02 18:59:24.000000000 +0200 @@ -2788,7 +2788,7 @@ if not os.path.exists(logdir): try: os.makedirs(logdir) - except (OSError, WindowsError): + except OSError: pass if os.path.isdir(logdir) and os.access(logdir, os.W_OK): logfile = os.path.join(logdir, 'wexpect%s.log' % suffix) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/dispcalGUI/worker.py new/dispcalGUI-1.1.2.1/dispcalGUI/worker.py --- old/dispcalGUI-1.1.0.0/dispcalGUI/worker.py 2012-09-15 21:19:38.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/dispcalGUI/worker.py 2012-10-02 18:59:24.000000000 +0200 @@ -913,11 +913,8 @@ if getcfg("measurement_mode.highres") and \ instrument_features.get("highres_mode") and not get_arg("-H", args): args += ["-H"] - if (self.argyll_version >= [1, 3, 0] and - not instrument_features.get("spectral") and - not is_ccxx_testchart() and - (self.get_instrument_name() != "ColorHug" or - getcfg("measurement_mode") in ("F", "R")) and not get_arg("-X", args)): + if (self.instrument_can_use_ccxx() and + not is_ccxx_testchart() and not get_arg("-X", args)): # Use colorimeter correction? # Special case: Spectrometer (not needed) and ColorHug # (only sensible in factory or raw measurement mode) @@ -971,6 +968,17 @@ args[-1] += "w" return True + def instrument_can_use_ccxx(self): + """ + Return boolean whether the instrument in its current measurement mode + can use a CCMX or CCSS colorimeter correction + + """ + return (self.argyll_version >= [1, 3, 0] and + not self.get_instrument_features().get("spectral") and + (self.get_instrument_name() != "ColorHug" or + getcfg("measurement_mode") in ("F", "R"))) + @Property def pwd(): def fget(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/misc/README.template.html new/dispcalGUI-1.1.2.1/misc/README.template.html --- old/dispcalGUI-1.1.0.0/misc/README.template.html 2012-09-15 21:19:39.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/misc/README.template.html 2012-10-05 21:10:05.000000000 +0200 @@ -360,7 +360,7 @@ <p>You need to have a working Python installation and all <a href="#requirements-source">requirements</a>.</p> <p><a href="http://dispcalGUI.hoech.net/download/dispcalGUI.tar.gz";>Source Tarball</a></p> <p> - Alternatively, if you don't mind trying out development code, <a href="http://sourceforge.net/p/dispcalgui/code/";>browse the <acronym title="Subversion">SVN<sup><a href="#definition_SVN">[8]</a></sup></acronym> repository of the latest development version</a> (or do a full checkout using <code>svn checkout svn+ssh://fho...@svn.code.sf.net/p/dispcalgui/code/trunk dispcalgui</code>). But please note that the development code might contain bugs or not run at all, or only on some platform(s). Use at your own risk. + Alternatively, if you don't mind trying out development code, <a href="http://sourceforge.net/p/dispcalgui/code/";>browse the <acronym title="Subversion">SVN<sup><a href="#definition_SVN">[8]</a></sup></acronym> repository of the latest development version</a> (or do a full checkout using <code>svn checkout svn://svn.code.sf.net/p/dispcalgui/code/trunk dispcalgui</code>). But please note that the development code might contain bugs or not run at all, or only on some platform(s). Use at your own risk. </p> </div> </li> @@ -1454,7 +1454,7 @@ Roberto Quintero (spanish translation), Tommaso Schiavinotto (italian translation)</p> - <p>Recent donors: Eugeniy Yurov, Hans Cremers, George Pop, Michael Gestgrasser, Stefan Pallari, Oliver Hoefele, Kyle Winfree, Alexander Mitchell, Juho Turunen, Jon Sands, Evgueni Ivanov, Riccardo Mandarano, Roman Romenskiy, Myron Blume, WTPM van Vucht, Philip Tobias, Richard Luney, Matthias Klausing, M E M van Ineveld, Patryk Bajer, Gregor Kofler, Richard Egger, Michael Dougherty, Christian Spyr, Konstantin Pyanzin</p> + <p>Recent donors: Andrew Hunter, Thomas Voigt, Александр Ольховский, Eugeniy Yurov, Hans Cremers, George Pop, Michael Gestgrasser, Stefan Pallari, Oliver Hoefele, Kyle Winfree, Alexander Mitchell, Juho Turunen, Jon Sands, Evgueni Ivanov, Riccardo Mandarano, Roman Romenskiy, Myron Blume, WTPM van Vucht, Philip Tobias, Richard Luney, Matthias Klausing, M E M van Ineveld, Patryk Bajer, Gregor Kofler, Richard Egger, Michael Dougherty, Christian Spyr, Konstantin Pyanzin</p> <p>And everyone who sent me feedback or bug reports, suggested features, or simply uses dispcalGUI.</p> @@ -1470,6 +1470,23 @@ <dt id="changelog-${VERSION}">${DATE} ${TIME} (UTC) ${VERSION}</dt> <dd> <h3>${VERSION}</h3> + <h4>Changed in this release:</h4> + <ul> + <li>Disable source profile selector in advanced gamut mapping options if not atleast one of perceptual or saturation checkboxes is selected.</li> + <li>Only show a warning if an incompatible colorimeter correction is explicitly selected via the filebrowser.</li> + <li>Show a less cryptic error message if an invalid file is selected when importing colorimeter corrections from other display profiling software.</li> + </ul> + <h4>Fixed in this release:</h4> + <ul> + <li>Whitepoint color temperature is an integer, not a float. This fixes calibration settings being detected as changed when they actually haven't.</li> + <li>Worked around a bug in wxPython where controls in a hidden window react to focus events. This fixes the sporadic hang after calibration measurements during a “Calibrate & profile” run.</li> + <li>Linux, Mac OS X: Unhandled exception when trying to import colorimeter corrections from other display profiling software and selecting a file with '.txt' extension.</li> + </ul> + </dd> + + <dt id="changelog-1.1">2012-09-15 15:38 (UTC) 1.1</dt> + <dd> + <h3>1.1</h3> <h4>Added in this release:</h4> <ul> <li>Additional profile name placeholder %ds for the display device serial from EDID if applicable (may be empty or bogus).</li> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/misc/dispcalGUI-Setup-py2exe.iss new/dispcalGUI-1.1.2.1/misc/dispcalGUI-Setup-py2exe.iss --- old/dispcalGUI-1.1.0.0/misc/dispcalGUI-Setup-py2exe.iss 2012-09-15 21:19:39.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/misc/dispcalGUI-Setup-py2exe.iss 2012-09-25 17:18:55.000000000 +0200 @@ -56,6 +56,8 @@ [Icons] Name: {group}\dispcalGUI; Filename: {app}\dispcalGUI.exe; IconFilename: {app}\dispcalGUI.exe Name: "{group}\dispcalGUI Profile Loader"; Filename: {app}\lib\pythonw.exe; Parameters: "-S ""{app}\scripts\dispcalGUI-apply-profiles"" --force"; WorkingDir: {app}; IconFilename: {app}\dispcalGUI.exe; +Name: "{group}\Profile Info"; Filename: {app}\lib\pythonw.exe; Parameters: "-S ""{app}\scripts\dispcalGUI-profile-info"""; WorkingDir: {app}; IconFilename: {app}\dispcalGUI.exe; +Name: "{group}\Testchart Editor"; Filename: {app}\lib\pythonw.exe; Parameters: "-S ""{app}\scripts\dispcalGUI-testchart-editor"""; WorkingDir: {app}; IconFilename: {app}\dispcalGUI.exe; Name: {group}\{cm:UninstallProgram,dispcalGUI}; Filename: {uninstallexe}; IconFilename: {app}\theme\icons\dispcalGUI-uninstall.ico; Tasks: ; Languages: Name: {commondesktop}\dispcalGUI; Filename: {app}\dispcalGUI.exe; Tasks: desktopicon; IconFilename: {app}\dispcalGUI.exe Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\dispcalGUI; Filename: {app}\dispcalGUI.exe; Tasks: quicklaunchicon; IconFilename: {app}\dispcalGUI.exe diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/misc/dispcalGUI.changes new/dispcalGUI-1.1.2.1/misc/dispcalGUI.changes --- old/dispcalGUI-1.1.0.0/misc/dispcalGUI.changes 2012-09-15 21:19:39.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/misc/dispcalGUI.changes 2012-10-05 21:10:05.000000000 +0200 @@ -4,6 +4,11 @@ - update to ${VERSION}: see README.html#changelog-${VERSION} ------------------------------------------------------------------- +Sat Sep 15 13:54:02 UTC 2012 - dispcal...@hoech.net + +- update to 1.1.0.0: see README.html#changelog-1.1.0.0 + +------------------------------------------------------------------- Wed Aug 01 09:08:34 UTC 2012 - dispcal...@hoech.net - update to 1.0.9.0: see README.html#changelog-1.0.9.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/misc/tests/fakecgats.txt new/dispcalGUI-1.1.2.1/misc/tests/fakecgats.txt --- old/dispcalGUI-1.1.0.0/misc/tests/fakecgats.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/dispcalGUI-1.1.2.1/misc/tests/fakecgats.txt 2012-09-23 13:40:58.000000000 +0200 @@ -0,0 +1,3 @@ +CC + +BEGIN_DATA \ No newline at end of file Files old/dispcalGUI-1.1.0.0/misc/tests/junk.cal and new/dispcalGUI-1.1.2.1/misc/tests/junk.cal differ Files old/dispcalGUI-1.1.0.0/misc/tests/junk.icc and new/dispcalGUI-1.1.2.1/misc/tests/junk.icc differ Files old/dispcalGUI-1.1.0.0/misc/tests/junk.icm and new/dispcalGUI-1.1.2.1/misc/tests/junk.icm differ Files old/dispcalGUI-1.1.0.0/misc/tests/junk.ti1 and new/dispcalGUI-1.1.2.1/misc/tests/junk.ti1 differ Files old/dispcalGUI-1.1.0.0/misc/tests/junk.ti2 and new/dispcalGUI-1.1.2.1/misc/tests/junk.ti2 differ Files old/dispcalGUI-1.1.0.0/misc/tests/junk.ti3 and new/dispcalGUI-1.1.2.1/misc/tests/junk.ti3 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/scripts/dispcalGUI-profile-info new/dispcalGUI-1.1.2.1/scripts/dispcalGUI-profile-info --- old/dispcalGUI-1.1.0.0/scripts/dispcalGUI-profile-info 1970-01-01 01:00:00.000000000 +0100 +++ new/dispcalGUI-1.1.2.1/scripts/dispcalGUI-profile-info 2012-09-25 17:18:55.000000000 +0200 @@ -0,0 +1,42 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import sys + +if sys.platform == "win32": + # Setup sys.path for running frozen + # i.e. add C:\Program Files\dispcalGUI\lib\library.zip + libpath = "\\".join(sys.executable.replace("/", "\\").split("\\")[:-1]) + "\\library.zip" + sys.path.insert(0, libpath) + +import os + +if sys.platform == "win32" and os.path.isfile(libpath): + sys.frozen = True + +parent_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + +if not getattr(sys, "frozen", False): + # Setup sys.path if running from source + if os.path.exists(os.path.join(parent_dir, "dispcalGUI", "__init__.py")): + sys.path.insert(0, parent_dir) + +from dispcalGUI import config + +if getattr(sys, "frozen", False): + # Add script parent directory to data directories if running frozen + config.data_dirs.insert(0, parent_dir) + +# Python version check +from dispcalGUI.meta import py_minversion, py_maxversion + +pyver = sys.version_info[:2] +if pyver < py_minversion or pyver > py_maxversion: + raise RuntimeError("Need Python version >= %s <= %s, got %s" % + (".".join(str(n) for n in py_minversion), + ".".join(str(n) for n in py_maxversion), + sys.version.split()[0])) + +from dispcalGUI.wxProfileInfo import main + +main() \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/scripts/dispcalGUI-testchart-editor new/dispcalGUI-1.1.2.1/scripts/dispcalGUI-testchart-editor --- old/dispcalGUI-1.1.0.0/scripts/dispcalGUI-testchart-editor 1970-01-01 01:00:00.000000000 +0100 +++ new/dispcalGUI-1.1.2.1/scripts/dispcalGUI-testchart-editor 2012-09-25 17:18:55.000000000 +0200 @@ -0,0 +1,42 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import sys + +if sys.platform == "win32": + # Setup sys.path for running frozen + # i.e. add C:\Program Files\dispcalGUI\lib\library.zip + libpath = "\\".join(sys.executable.replace("/", "\\").split("\\")[:-1]) + "\\library.zip" + sys.path.insert(0, libpath) + +import os + +if sys.platform == "win32" and os.path.isfile(libpath): + sys.frozen = True + +parent_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + +if not getattr(sys, "frozen", False): + # Setup sys.path if running from source + if os.path.exists(os.path.join(parent_dir, "dispcalGUI", "__init__.py")): + sys.path.insert(0, parent_dir) + +from dispcalGUI import config + +if getattr(sys, "frozen", False): + # Add script parent directory to data directories if running frozen + config.data_dirs.insert(0, parent_dir) + +# Python version check +from dispcalGUI.meta import py_minversion, py_maxversion + +pyver = sys.version_info[:2] +if pyver < py_minversion or pyver > py_maxversion: + raise RuntimeError("Need Python version >= %s <= %s, got %s" % + (".".join(str(n) for n in py_minversion), + ".".join(str(n) for n in py_maxversion), + sys.version.split()[0])) + +from dispcalGUI.wxTestchartEditor import main + +main() \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/util/autopackage-extract.py new/dispcalGUI-1.1.2.1/util/autopackage-extract.py --- old/dispcalGUI-1.1.0.0/util/autopackage-extract.py 2012-09-15 21:19:39.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/util/autopackage-extract.py 2012-10-02 18:59:24.000000000 +0200 @@ -41,9 +41,9 @@ data = package_file.read(datasize) with open('%s.sh' % package, 'wb') as script_file: script_file.write(script) - with open('%s.meta.gz' % package, 'wb') as meta_file: + with open('%s.meta.tar.gz' % package, 'wb') as meta_file: meta_file.write(meta) - with open('%s.payload.%s' % (package, compression), 'wb') as data_file: + with open('%s.payload.tar.%s' % (package, compression), 'wb') as data_file: data_file.write(data) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/util/dist.cmd new/dispcalGUI-1.1.2.1/util/dist.cmd --- old/dispcalGUI-1.1.0.0/util/dist.cmd 2012-09-15 21:19:39.000000000 +0200 +++ new/dispcalGUI-1.1.2.1/util/dist.cmd 2012-09-25 17:18:55.000000000 +0200 @@ -59,3 +59,5 @@ C:\Python26\python.exe setup.py bdist_wininst --user-access-control=auto --use-distutils 2>&1 | tee dispcalGUI-%version%.wininst-py2.6.log ) ) + +python util\tidy_dist.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/util/dist_osx.sh new/dispcalGUI-1.1.2.1/util/dist_osx.sh --- old/dispcalGUI-1.1.0.0/util/dist_osx.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/dispcalGUI-1.1.2.1/util/dist_osx.sh 2012-09-23 13:40:58.000000000 +0200 @@ -0,0 +1,19 @@ +#!/bin/sh + +# Make sure __version__.py is current +./setup.py + +version=`python -c "from dispcalGUI import meta;print meta.version"` + +# Source tarball +./setup.py sdist --use-distutils 2>&1 | tee dispcalGUI-$version.sdist.log + +# 0install +util/dist_0install.sh + +# App bundle & dmg +./setup.py bdist_standalone 2>&1 | tee dispcalGUI-$version.bdist_standalone_osx.log +./setup.py bdist_appdmg 2>&1 | tee -a dispcalGUI-$version.bdist_standalone_osx.log + +# Cleanup +util/tidy_dist.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dispcalGUI-1.1.0.0/util/tidy_dist.py new/dispcalGUI-1.1.2.1/util/tidy_dist.py --- old/dispcalGUI-1.1.0.0/util/tidy_dist.py 1970-01-01 01:00:00.000000000 +0100 +++ new/dispcalGUI-1.1.2.1/util/tidy_dist.py 2012-09-23 13:40:58.000000000 +0200 @@ -0,0 +1,23 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import glob +import os +import re +import shutil + + +def main(): + dist = glob.glob(os.path.join('dist', 'dispcalGUI-*')) + for entry in dist: + version = re.search('\d+(?:\.\d+){3}', entry) + if version: + version = version.group() + version_dir = os.path.join('dist', version) + if not os.path.isdir(version_dir): + os.mkdir(version_dir) + shutil.move(entry, version_dir) + + +if __name__ == '__main__': + main() ++++++ dispcalGUI.dsc ++++++ --- /var/tmp/diff_new_pack.WYT69c/_old 2012-10-16 11:29:17.000000000 +0200 +++ /var/tmp/diff_new_pack.WYT69c/_new 2012-10-16 11:29:17.000000000 +0200 @@ -1,11 +1,11 @@ -Debtransform-Tar: dispcalGUI-1.1.0.0.tar.gz +Debtransform-Tar: dispcalGUI-1.1.2.1.tar.gz Format: 1.0 Source: dispcalgui -Version: 1.1.0.0 +Version: 1.1.2.1 Binary: dispcalgui Maintainer: Florian Höch <dispcal...@hoech.net> Architecture: any Build-Depends: debhelper (>= 5.0.38), doc-base, gcc, python-dev, libxinerama-dev, libxrandr-dev, libxxf86vm-dev Files: - ffffffffffffffffffffffffffffffff 1 dispcalgui_1.1.0.0.orig.tar.gz - ffffffffffffffffffffffffffffffff 1 dispcalgui_1.1.0.0-1.diff.tar.gz + ffffffffffffffffffffffffffffffff 1 dispcalgui_1.1.2.1.orig.tar.gz + ffffffffffffffffffffffffffffffff 1 dispcalgui_1.1.2.1-1.diff.tar.gz -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
